summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/locale/django.pot569
-rw-r--r--ishtar_common/models.py13
-rw-r--r--ishtar_common/views.py11
3 files changed, 304 insertions, 289 deletions
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 5110bca31..b687a55ed 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -127,40 +127,40 @@ msgstr ""
msgid "\"%(value)s\" not in %(values)s"
msgstr ""
-#: forms.py:55
+#: forms.py:72
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr ""
-#: forms.py:71 forms_common.py:618
+#: forms.py:88 forms_common.py:618
msgid "Confirm"
msgstr ""
-#: forms.py:76
+#: forms.py:93
msgid "Are you sure you want to delete?"
msgstr ""
-#: forms.py:85
+#: forms.py:102
msgid "There are identical items."
msgstr ""
-#: forms.py:123 forms.py:124
+#: forms.py:140 forms.py:141
msgid "Closing date"
msgstr ""
-#: forms.py:137
+#: forms.py:154
msgid "You should select an item."
msgstr ""
-#: forms.py:138
+#: forms.py:155
msgid "Add a new item"
msgstr ""
-#: forms.py:245 models.py:1310
+#: forms.py:262 models.py:1355
msgid "Template"
msgstr ""
#: forms_common.py:41 forms_common.py:59 forms_common.py:182
-#: forms_common.py:406 models.py:1376 models.py:2758
+#: forms_common.py:406 models.py:1421 models.py:2810
#: templates/blocks/JQueryAdvancedTown.html:19
#: templates/ishtar/sheet_organization.html:13
msgid "Town"
@@ -176,8 +176,8 @@ msgid ""
"french town Saint-Denis in the Seine-Saint-Denis department.</p>"
msgstr ""
-#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1546
-#: models.py:2384 models.py:2566 models.py:2628
+#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1594
+#: models.py:2436 models.py:2618 models.py:2680
#: templates/ishtar/sheet_person.html:4
msgid "Person"
msgstr ""
@@ -189,63 +189,63 @@ msgid ""
msgstr ""
#: forms_common.py:170 forms_common.py:327 forms_common.py:451
-#: ishtar_menu.py:75 models.py:1547 models.py:2273
+#: ishtar_menu.py:75 models.py:1595 models.py:2322
#: templates/ishtar/sheet_organization.html:4
msgid "Organization"
msgstr ""
#: forms_common.py:173 forms_common.py:210 forms_common.py:322
-#: forms_common.py:376 forms_common.py:446 models.py:977 models.py:1309
-#: models.py:1592 models.py:1810 models.py:2267 models.py:2370 models.py:2744
+#: forms_common.py:376 forms_common.py:446 models.py:1022 models.py:1354
+#: models.py:1640 models.py:1859 models.py:2316 models.py:2422 models.py:2796
#: templates/ishtar/sheet_organization.html:8
#: templates/ishtar/sheet_organization.html:21
msgid "Name"
msgstr ""
-#: forms_common.py:174 models.py:1531 models.py:1941
+#: forms_common.py:174 models.py:1576 models.py:1990
msgid "Organization type"
msgstr ""
-#: forms_common.py:176 forms_common.py:400 models.py:1371
+#: forms_common.py:176 forms_common.py:400 models.py:1416
#: templates/ishtar/sheet_organization.html:10
msgid "Address"
msgstr ""
-#: forms_common.py:178 forms_common.py:403 models.py:1372
+#: forms_common.py:178 forms_common.py:403 models.py:1417
#: templates/ishtar/sheet_organization.html:11
msgid "Address complement"
msgstr ""
-#: forms_common.py:180 forms_common.py:404 models.py:1374
+#: forms_common.py:180 forms_common.py:404 models.py:1419
#: templates/ishtar/sheet_organization.html:12
msgid "Postal code"
msgstr ""
-#: forms_common.py:183 forms_common.py:407 models.py:1377
+#: forms_common.py:183 forms_common.py:407 models.py:1422
msgid "Country"
msgstr ""
#: forms_common.py:185 forms_common.py:324 forms_common.py:380
-#: forms_common.py:448 forms_common.py:572 models.py:1404
+#: forms_common.py:448 forms_common.py:572 models.py:1449
msgid "Email"
msgstr ""
-#: forms_common.py:186 forms_common.py:383 models.py:1389
+#: forms_common.py:186 forms_common.py:383 models.py:1434
#: templates/ishtar/sheet_organization.html:14
#: templates/ishtar/sheet_person.html:19
#: templates/ishtar/wizard/wizard_person.html:17
msgid "Phone"
msgstr ""
-#: forms_common.py:187 forms_common.py:392 models.py:1401
+#: forms_common.py:187 forms_common.py:392 models.py:1446
#: templates/ishtar/sheet_organization.html:15
#: templates/ishtar/sheet_person.html:37
#: templates/ishtar/wizard/wizard_person.html:35
msgid "Mobile phone"
msgstr ""
-#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:1969
-#: models.py:2269 models.py:2679 templates/sheet_ope.html:85
+#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2018
+#: models.py:2318 models.py:2731 templates/sheet_ope.html:85
#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
#: templates/ishtar/import_list.html:13
#: templates/ishtar/sheet_organization.html:23
@@ -253,12 +253,12 @@ msgstr ""
msgid "Type"
msgstr ""
-#: forms_common.py:220 views.py:139
+#: forms_common.py:220 views.py:142
msgid "Organization search"
msgstr ""
#: forms_common.py:244
-msgid "At leat two items have to be selected."
+msgid "At least two items have to be selected."
msgstr ""
#: forms_common.py:262
@@ -269,12 +269,12 @@ msgstr ""
msgid "Organization to merge"
msgstr ""
-#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2368
+#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2420
#: templates/ishtar/sheet_organization.html:22
msgid "Surname"
msgstr ""
-#: forms_common.py:339 forms_common.py:434 views.py:104
+#: forms_common.py:339 forms_common.py:434 views.py:107
msgid "Person search"
msgstr ""
@@ -287,25 +287,25 @@ msgstr ""
msgid "Identity"
msgstr ""
-#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1942
-#: models.py:2362 models.py:2364 models.py:2676 templates/sheet_ope.html:104
+#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1991
+#: models.py:2414 models.py:2416 models.py:2728 templates/sheet_ope.html:104
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr ""
-#: forms_common.py:372 models.py:2366
+#: forms_common.py:372 models.py:2418
msgid "Salutation"
msgstr ""
-#: forms_common.py:378 models.py:2372
+#: forms_common.py:378 models.py:2424
msgid "Raw name"
msgstr ""
-#: forms_common.py:381 models.py:1390
+#: forms_common.py:381 models.py:1435
msgid "Phone description"
msgstr ""
-#: forms_common.py:384 models.py:1392 models.py:1394
+#: forms_common.py:384 models.py:1437 models.py:1439
msgid "Phone description 2"
msgstr ""
@@ -313,11 +313,11 @@ msgstr ""
msgid "Phone 2"
msgstr ""
-#: forms_common.py:388 models.py:1398
+#: forms_common.py:388 models.py:1443
msgid "Phone description 3"
msgstr ""
-#: forms_common.py:390 models.py:1396
+#: forms_common.py:390 models.py:1441
msgid "Phone 3"
msgstr ""
@@ -325,23 +325,23 @@ msgstr ""
msgid "Current organization"
msgstr ""
-#: forms_common.py:409 models.py:1379
+#: forms_common.py:409 models.py:1424
msgid "Other address: address"
msgstr ""
-#: forms_common.py:412 models.py:1382
+#: forms_common.py:412 models.py:1427
msgid "Other address: address complement"
msgstr ""
-#: forms_common.py:414 models.py:1383
+#: forms_common.py:414 models.py:1428
msgid "Other address: postal code"
msgstr ""
-#: forms_common.py:416 models.py:1385
+#: forms_common.py:416 models.py:1430
msgid "Other address: town"
msgstr ""
-#: forms_common.py:418 models.py:1387
+#: forms_common.py:418 models.py:1432
msgid "Other address: country"
msgstr ""
@@ -357,7 +357,7 @@ msgstr ""
msgid "Account search"
msgstr ""
-#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2321
+#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2370
msgid "Person type"
msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
msgid "Account"
msgstr ""
-#: forms_common.py:575 wizards.py:1192
+#: forms_common.py:575 wizards.py:1194
msgid "New password"
msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
msgid "Send the new password by email?"
msgstr ""
-#: forms_common.py:628 forms_common.py:641 models.py:2759
+#: forms_common.py:628 forms_common.py:641 models.py:2811
msgid "Towns"
msgstr ""
@@ -405,7 +405,7 @@ msgstr ""
msgid "Documentation informations"
msgstr ""
-#: forms_common.py:775 forms_common.py:823 models.py:1943 models.py:2653
+#: forms_common.py:775 forms_common.py:823 models.py:1992 models.py:2705
msgid "Source type"
msgstr ""
@@ -417,37 +417,37 @@ msgstr ""
msgid "Internal reference"
msgstr ""
-#: forms_common.py:783 models.py:2690
+#: forms_common.py:783 models.py:2742
msgid "Numerical ressource (web address)"
msgstr ""
-#: forms_common.py:784 models.py:2692
+#: forms_common.py:784 models.py:2744
msgid "Receipt date"
msgstr ""
-#: forms_common.py:786 models.py:2096 models.py:2694
+#: forms_common.py:786 models.py:2145 models.py:2746
msgid "Creation date"
msgstr ""
-#: forms_common.py:789 models.py:2697
+#: forms_common.py:789 models.py:2749
msgid "Receipt date in documentation"
msgstr ""
-#: forms_common.py:791 forms_common.py:827 models.py:317 models.py:577
-#: models.py:1837 models.py:2376 models.py:2704
+#: forms_common.py:791 forms_common.py:827 models.py:317 models.py:622
+#: models.py:1886 models.py:2428 models.py:2756
msgid "Comment"
msgstr ""
-#: forms_common.py:793 forms_common.py:826 models.py:979 models.py:1596
-#: models.py:1769 models.py:1811 models.py:2703 templates/sheet_ope.html:128
+#: forms_common.py:793 forms_common.py:826 models.py:1024 models.py:1644
+#: models.py:1818 models.py:1860 models.py:2755 templates/sheet_ope.html:128
msgid "Description"
msgstr ""
-#: forms_common.py:796 models.py:2705
+#: forms_common.py:796 models.py:2757
msgid "Additional information"
msgstr ""
-#: forms_common.py:798 forms_common.py:830 models.py:2707
+#: forms_common.py:798 forms_common.py:830 models.py:2759
msgid "Has a duplicate"
msgstr ""
@@ -462,7 +462,7 @@ msgid ""
"p>"
msgstr ""
-#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2633
+#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2685
#: templates/ishtar/wizard/wizard_person_deletion.html:124
msgid "Author"
msgstr ""
@@ -475,7 +475,7 @@ msgstr ""
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:856 models.py:1944 models.py:2621 models.py:2630
+#: forms_common.py:856 models.py:1993 models.py:2673 models.py:2682
msgid "Author type"
msgstr ""
@@ -487,7 +487,7 @@ msgstr ""
msgid "There are identical authors."
msgstr ""
-#: forms_common.py:893 models.py:2634 models.py:2686
+#: forms_common.py:893 models.py:2686 models.py:2738
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:9
msgid "Authors"
@@ -501,11 +501,11 @@ msgstr ""
msgid "Add/modify"
msgstr ""
-#: ishtar_menu.py:36
+#: ishtar_menu.py:36 ishtar_menu.py:70 ishtar_menu.py:101
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:39 models.py:1105 views.py:1484
+#: ishtar_menu.py:39 models.py:1150 views.py:1494
msgid "Global variables"
msgstr ""
@@ -533,20 +533,15 @@ msgstr ""
msgid "Manual merge"
msgstr ""
-#: ishtar_menu.py:70 ishtar_menu.py:101 models.py:2133 widgets.py:110
-#: templates/ishtar/form_delete.html:11
-msgid "Delete"
-msgstr ""
-
-#: ishtar_menu.py:109 models.py:2107
+#: ishtar_menu.py:109 models.py:2156
msgid "Imports"
msgstr ""
-#: ishtar_menu.py:112 views.py:1492
+#: ishtar_menu.py:112 views.py:1502
msgid "New import"
msgstr ""
-#: ishtar_menu.py:116 views.py:1506
+#: ishtar_menu.py:116 views.py:1516
msgid "Current imports"
msgstr ""
@@ -566,7 +561,7 @@ msgstr ""
msgid "This item already exists."
msgstr ""
-#: models.py:313 models.py:576 models.py:1344 models.py:1356
+#: models.py:313 models.py:621 models.py:1389 models.py:1401 models.py:1815
msgid "Label"
msgstr ""
@@ -574,192 +569,192 @@ msgstr ""
msgid "Textual ID"
msgstr ""
-#: models.py:318 models.py:579 models.py:1313
+#: models.py:318 models.py:624 models.py:1358
msgid "Available"
msgstr ""
-#: models.py:598 models.py:1883
+#: models.py:643 models.py:1932
msgid "Key"
msgstr ""
-#: models.py:604
+#: models.py:649
msgid "Specific key to an import"
msgstr ""
-#: models.py:696
+#: models.py:741
msgid "Last editor"
msgstr ""
-#: models.py:699
+#: models.py:744
msgid "Creator"
msgstr ""
-#: models.py:841 models.py:2770
+#: models.py:886 models.py:2822
msgid "Order"
msgstr ""
-#: models.py:842
+#: models.py:887
msgid "Symmetrical"
msgstr ""
-#: models.py:843
+#: models.py:888
msgid "Tiny label"
msgstr ""
-#: models.py:857
+#: models.py:902
msgid "Cannot have symmetrical and an inverse_relation"
msgstr ""
-#: models.py:971
+#: models.py:1016
msgid "Euro"
msgstr ""
-#: models.py:972
+#: models.py:1017
msgid "US dollar"
msgstr ""
-#: models.py:978 models.py:1594
+#: models.py:1023 models.py:1642
msgid "Slug"
msgstr ""
-#: models.py:980
+#: models.py:1025
msgid "Files module"
msgstr ""
-#: models.py:981
+#: models.py:1026
msgid "Context records module"
msgstr ""
-#: models.py:983
+#: models.py:1028
msgid "Finds module"
msgstr ""
-#: models.py:984
+#: models.py:1029
msgid "Need context records module"
msgstr ""
-#: models.py:986
+#: models.py:1031
msgid "Warehouses module"
msgstr ""
-#: models.py:987
+#: models.py:1032
msgid "Need finds module"
msgstr ""
-#: models.py:989
+#: models.py:1034
msgid "Home page"
msgstr ""
-#: models.py:990
+#: models.py:1035
#, python-brace-format
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
"markdown syntax. {random_image} can be used to display a random image."
msgstr ""
-#: models.py:994
+#: models.py:1039
msgid "File external id"
msgstr ""
-#: models.py:996
+#: models.py:1041
msgid ""
"Formula to manage file external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1001
+#: models.py:1046
msgid "Parcel external id"
msgstr ""
-#: models.py:1004
+#: models.py:1049
msgid ""
"Formula to manage parcel external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1009
+#: models.py:1054
msgid "Context record external id"
msgstr ""
-#: models.py:1011
+#: models.py:1056
msgid ""
"Formula to manage context record external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1016
+#: models.py:1061
msgid "Base find external id"
msgstr ""
-#: models.py:1018
+#: models.py:1063
msgid ""
"Formula to manage base find external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1023
+#: models.py:1068
msgid "Find external id"
msgstr ""
-#: models.py:1025
+#: models.py:1070
msgid ""
"Formula to manage find external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1030
+#: models.py:1075
msgid "Raw name for person"
msgstr ""
-#: models.py:1032
+#: models.py:1077
msgid ""
"Formula to manage person raw_name. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1036
+#: models.py:1081
msgid "Current active"
msgstr ""
-#: models.py:1037
+#: models.py:1082
msgid "Currency"
msgstr ""
-#: models.py:1041
+#: models.py:1086
msgid "Ishtar site profile"
msgstr ""
-#: models.py:1042
+#: models.py:1087
msgid "Ishtar site profiles"
msgstr ""
-#: models.py:1098
+#: models.py:1143
msgid "Variable name"
msgstr ""
-#: models.py:1099
+#: models.py:1144
msgid "Description of the variable"
msgstr ""
-#: models.py:1101 models.py:1884
+#: models.py:1146 models.py:1933
msgid "Value"
msgstr ""
-#: models.py:1104
+#: models.py:1149
msgid "Global variable"
msgstr ""
-#: models.py:1214 models.py:1244
+#: models.py:1259 models.py:1289
msgid "Total"
msgstr ""
-#: models.py:1221 models.py:1345 models.py:1357
+#: models.py:1266 models.py:1390 models.py:1402
#: templates/ishtar/sheet_person.html:22
#: templates/ishtar/dashboards/dashboard_main_detail.html:141
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
@@ -767,597 +762,601 @@ msgstr ""
msgid "Number"
msgstr ""
-#: models.py:1308
+#: models.py:1353
msgid "Administrative Act"
msgstr ""
-#: models.py:1312
+#: models.py:1357
msgid "Associated object"
msgstr ""
-#: models.py:1316
+#: models.py:1361
msgid "Document template"
msgstr ""
-#: models.py:1317
+#: models.py:1362
msgid "Document templates"
msgstr ""
-#: models.py:1348 models.py:1358 models.py:2091
+#: models.py:1393 models.py:1403 models.py:2140
msgid "State"
msgstr ""
-#: models.py:1362 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:1407 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr ""
-#: models.py:1363
+#: models.py:1408
msgid "Departments"
msgstr ""
-#: models.py:1400
+#: models.py:1445
msgid "Raw phone"
msgstr ""
-#: models.py:1406
+#: models.py:1451
msgid "Alternative address is prefered"
msgstr ""
-#: models.py:1445
+#: models.py:1490
msgid "Tel: "
msgstr ""
-#: models.py:1449
+#: models.py:1494
msgid "Mobile: "
msgstr ""
-#: models.py:1453
+#: models.py:1498
msgid "Email: "
msgstr ""
-#: models.py:1458
+#: models.py:1503
msgid "Merge key"
msgstr ""
-#: models.py:1532
+#: models.py:1577
msgid "Organization types"
msgstr ""
-#: models.py:1548 views.py:234
+#: models.py:1596 views.py:237
msgid "Operation"
msgstr ""
-#: models.py:1550
+#: models.py:1598
msgid "Archaeological site"
msgstr ""
-#: models.py:1551
+#: models.py:1599
msgid "Parcels"
msgstr ""
-#: models.py:1553
+#: models.py:1601
msgid "Operation source"
msgstr ""
-#: models.py:1556 views.py:1299 views.py:1350
+#: models.py:1604 views.py:1310 views.py:1360
msgid "Archaeological files"
msgstr ""
-#: models.py:1558 views.py:1302 views.py:1358
+#: models.py:1606 views.py:1313 views.py:1368
msgid "Context records"
msgstr ""
-#: models.py:1560
+#: models.py:1608
msgid "Context record relations"
msgstr ""
-#: models.py:1562 views.py:1304 views.py:1361
+#: models.py:1610 views.py:1315 views.py:1371
msgid "Finds"
msgstr ""
-#: models.py:1598 templates/ishtar/dashboards/dashboard_main.html:25
+#: models.py:1646 templates/ishtar/dashboards/dashboard_main.html:25
msgid "Users"
msgstr ""
-#: models.py:1600
+#: models.py:1648
msgid "Associated model"
msgstr ""
-#: models.py:1603
+#: models.py:1651
msgid "Is template"
msgstr ""
-#: models.py:1604
+#: models.py:1652
msgid "Unicity keys (separator \";\")"
msgstr ""
-#: models.py:1608
+#: models.py:1656
msgid "Importer - Type"
msgstr ""
-#: models.py:1609
+#: models.py:1657
msgid "Importer - Types"
msgstr ""
-#: models.py:1699
+#: models.py:1747
msgid "Importer - Default"
msgstr ""
-#: models.py:1700
+#: models.py:1748
msgid "Importer - Defaults"
msgstr ""
-#: models.py:1735
+#: models.py:1783
msgid "Importer - Default value"
msgstr ""
-#: models.py:1736
+#: models.py:1784
msgid "Importer - Default values"
msgstr ""
-#: models.py:1768
+#: models.py:1817
msgid "Column number"
msgstr ""
-#: models.py:1771
+#: models.py:1820
msgid "Required"
msgstr ""
-#: models.py:1774
+#: models.py:1823
msgid "Importer - Column"
msgstr ""
-#: models.py:1775
+#: models.py:1824
msgid "Importer - Columns"
msgstr ""
-#: models.py:1795
+#: models.py:1844
msgid "Field name"
msgstr ""
-#: models.py:1797 models.py:1831
+#: models.py:1846 models.py:1880
msgid "Force creation of new items"
msgstr ""
-#: models.py:1799 models.py:1833
+#: models.py:1848 models.py:1882
msgid "Concatenate with existing"
msgstr ""
-#: models.py:1801 models.py:1835
+#: models.py:1850 models.py:1884
msgid "Concatenate character"
msgstr ""
-#: models.py:1805
+#: models.py:1854
msgid "Importer - Duplicate field"
msgstr ""
-#: models.py:1806
+#: models.py:1855
msgid "Importer - Duplicate fields"
msgstr ""
-#: models.py:1813
+#: models.py:1862
msgid "Regular expression"
msgstr ""
-#: models.py:1816
+#: models.py:1865
msgid "Importer - Regular expression"
msgstr ""
-#: models.py:1817
+#: models.py:1866
msgid "Importer - Regular expressions"
msgstr ""
-#: models.py:1840
+#: models.py:1889
msgid "Importer - Target"
msgstr ""
-#: models.py:1841
+#: models.py:1890
msgid "Importer - Targets"
msgstr ""
-#: models.py:1865 views.py:518
+#: models.py:1914 views.py:520
msgid "True"
msgstr ""
-#: models.py:1866 views.py:520
+#: models.py:1915 views.py:522
msgid "False"
msgstr ""
-#: models.py:1885
+#: models.py:1934
msgid "Is set"
msgstr ""
-#: models.py:1892
+#: models.py:1941
msgid "Importer - Target key"
msgstr ""
-#: models.py:1893
+#: models.py:1942
msgid "Importer - Targets keys"
msgstr ""
-#: models.py:1945 models.py:2669 models.py:2682
+#: models.py:1994 models.py:2721 models.py:2734
msgid "Format"
msgstr ""
-#: models.py:1946 models.py:2774
+#: models.py:1995 models.py:2826
msgid "Operation type"
msgstr ""
-#: models.py:1947
+#: models.py:1996
msgid "Period"
msgstr ""
-#: models.py:1948
+#: models.py:1997
msgid "Report state"
msgstr ""
-#: models.py:1949
+#: models.py:1998
msgid "Unit"
msgstr ""
-#: models.py:1950
+#: models.py:1999
msgid "Material"
msgstr ""
-#: models.py:1952
+#: models.py:2001
msgid "Conservatory state"
msgstr ""
-#: models.py:1953
+#: models.py:2002
msgid "Preservation type"
msgstr ""
-#: models.py:1954
+#: models.py:2003
msgid "Object type"
msgstr ""
-#: models.py:1956
+#: models.py:2005
msgid "Identification type"
msgstr ""
-#: models.py:1958
+#: models.py:2007
msgid "Context record relation type"
msgstr ""
-#: models.py:1959 models.py:2661
+#: models.py:2008 models.py:2713
msgid "Support type"
msgstr ""
-#: models.py:1965
+#: models.py:2014
msgid "Integer"
msgstr ""
-#: models.py:1966
+#: models.py:2015
msgid "Float"
msgstr ""
-#: models.py:1967
+#: models.py:2016
msgid "String"
msgstr ""
-#: models.py:1968 templates/sheet_ope.html:86
+#: models.py:2017 templates/sheet_ope.html:86
msgid "Date"
msgstr ""
-#: models.py:1970 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
+#: models.py:2019 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
#: templates/ishtar/dashboards/dashboard_main_detail.html:126
msgid "Year"
msgstr ""
-#: models.py:1971
+#: models.py:2020
msgid "String to boolean"
msgstr ""
-#: models.py:1972
+#: models.py:2021
msgctxt "filesystem"
msgid "File"
msgstr ""
-#: models.py:1973
+#: models.py:2022
msgid "Unknow type"
msgstr ""
-#: models.py:1989
+#: models.py:2038
msgid "4 digit year. e.g.: \"2015\""
msgstr ""
-#: models.py:1990
+#: models.py:2039
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr ""
-#: models.py:1991
+#: models.py:2040
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr ""
-#: models.py:2001
+#: models.py:2050
msgid "Options"
msgstr ""
-#: models.py:2003
+#: models.py:2052
msgid "Split character(s)"
msgstr ""
-#: models.py:2007
+#: models.py:2056
msgid "Importer - Formater type"
msgstr ""
-#: models.py:2008
+#: models.py:2057
msgid "Importer - Formater types"
msgstr ""
-#: models.py:2055 templates/ishtar/dashboards/dashboard_main_detail.html:63
+#: models.py:2104 templates/ishtar/dashboards/dashboard_main_detail.html:63
msgid "Created"
msgstr ""
-#: models.py:2056
+#: models.py:2105
msgid "Analyse in progress"
msgstr ""
-#: models.py:2057
+#: models.py:2106
msgid "Analysed"
msgstr ""
-#: models.py:2058
+#: models.py:2107
msgid "Import pending"
msgstr ""
-#: models.py:2059
+#: models.py:2108
msgid "Import in progress"
msgstr ""
-#: models.py:2060
+#: models.py:2109
msgid "Finished with errors"
msgstr ""
-#: models.py:2061
+#: models.py:2110
msgid "Finished"
msgstr ""
-#: models.py:2062
+#: models.py:2111
msgid "Archived"
msgstr ""
-#: models.py:2074
+#: models.py:2123
msgid "Imported file"
msgstr ""
-#: models.py:2077
+#: models.py:2126
msgid "Associated images (zip file)"
msgstr ""
-#: models.py:2079
+#: models.py:2128
msgid "Encoding"
msgstr ""
-#: models.py:2081
+#: models.py:2130
msgid "Skip lines"
msgstr ""
-#: models.py:2082 templates/ishtar/import_list.html:47
+#: models.py:2131 templates/ishtar/import_list.html:47
msgid "Error file"
msgstr ""
-#: models.py:2085
+#: models.py:2134
msgid "Result file"
msgstr ""
-#: models.py:2088 templates/ishtar/import_list.html:53
+#: models.py:2137 templates/ishtar/import_list.html:53
msgid "Match file"
msgstr ""
-#: models.py:2094
+#: models.py:2143
msgid "Conservative import"
msgstr ""
-#: models.py:2099
+#: models.py:2148
msgid "End date"
msgstr ""
-#: models.py:2101
+#: models.py:2150
msgid "Remaining seconds"
msgstr ""
-#: models.py:2106
+#: models.py:2155
msgid "Import"
msgstr ""
-#: models.py:2123
+#: models.py:2172
msgid "Analyse"
msgstr ""
-#: models.py:2125 models.py:2128
+#: models.py:2174 models.py:2177
msgid "Re-analyse"
msgstr ""
-#: models.py:2126
+#: models.py:2175
msgid "Launch import"
msgstr ""
-#: models.py:2129
+#: models.py:2178
msgid "Re-import"
msgstr ""
-#: models.py:2130
+#: models.py:2179
msgid "Archive"
msgstr ""
-#: models.py:2132
+#: models.py:2181
msgid "Unarchive"
msgstr ""
-#: models.py:2274
+#: models.py:2182 widgets.py:110 templates/ishtar/form_delete.html:11
+msgid "Delete"
+msgstr ""
+
+#: models.py:2323
msgid "Organizations"
msgstr ""
-#: models.py:2276
+#: models.py:2325
msgid "Can view all Organizations"
msgstr ""
-#: models.py:2277
+#: models.py:2326
msgid "Can view own Organization"
msgstr ""
-#: models.py:2278
+#: models.py:2327
msgid "Can add own Organization"
msgstr ""
-#: models.py:2280
+#: models.py:2329
msgid "Can change own Organization"
msgstr ""
-#: models.py:2282
+#: models.py:2331
msgid "Can delete own Organization"
msgstr ""
-#: models.py:2317
+#: models.py:2366
msgid "Groups"
msgstr ""
-#: models.py:2322
+#: models.py:2371
msgid "Person types"
msgstr ""
-#: models.py:2330
+#: models.py:2382
msgid "Title type"
msgstr ""
-#: models.py:2331
+#: models.py:2383
msgid "Title types"
msgstr ""
-#: models.py:2340
+#: models.py:2392
msgid "Mr"
msgstr ""
-#: models.py:2341
+#: models.py:2393
msgid "Miss"
msgstr ""
-#: models.py:2342
+#: models.py:2394
msgid "Mr and Mrs"
msgstr ""
-#: models.py:2343
+#: models.py:2395
msgid "Mrs"
msgstr ""
-#: models.py:2344
+#: models.py:2396
msgid "Doctor"
msgstr ""
-#: models.py:2374
+#: models.py:2426
msgid "Contact type"
msgstr ""
-#: models.py:2377 models.py:2441
+#: models.py:2429 models.py:2493
msgid "Types"
msgstr ""
-#: models.py:2380
+#: models.py:2432
msgid "Is attached to"
msgstr ""
-#: models.py:2385
+#: models.py:2437
msgid "Persons"
msgstr ""
-#: models.py:2387
+#: models.py:2439
msgid "Can view all Persons"
msgstr ""
-#: models.py:2388
+#: models.py:2440
msgid "Can view own Person"
msgstr ""
-#: models.py:2389
+#: models.py:2441
msgid "Can add own Person"
msgstr ""
-#: models.py:2390
+#: models.py:2442
msgid "Can change own Person"
msgstr ""
-#: models.py:2391
+#: models.py:2443
msgid "Can delete own Person"
msgstr ""
-#: models.py:2569
+#: models.py:2621
msgid "Advanced shortcut menu"
msgstr ""
-#: models.py:2572
+#: models.py:2624
msgid "Ishtar user"
msgstr ""
-#: models.py:2573
+#: models.py:2625
msgid "Ishtar users"
msgstr ""
-#: models.py:2616
+#: models.py:2668
msgid "To modify the password use the form in Auth > User"
msgstr ""
-#: models.py:2622
+#: models.py:2674
msgid "Author types"
msgstr ""
-#: models.py:2654
+#: models.py:2706
msgid "Source types"
msgstr ""
-#: models.py:2662
+#: models.py:2714
msgid "Support types"
msgstr ""
-#: models.py:2670
+#: models.py:2722
msgid "Formats"
msgstr ""
-#: models.py:2677
+#: models.py:2729
msgid "External ID"
msgstr ""
-#: models.py:2680
+#: models.py:2732
msgid "Support"
msgstr ""
-#: models.py:2684
+#: models.py:2736
msgid "Scale"
msgstr ""
-#: models.py:2698
+#: models.py:2750
msgid "Item number"
msgstr ""
-#: models.py:2699
+#: models.py:2751
msgid "Ref."
msgstr ""
-#: models.py:2702
+#: models.py:2754
msgid "Internal ref."
msgstr ""
-#: models.py:2745
+#: models.py:2797
msgid "Surface (m2)"
msgstr ""
-#: models.py:2746 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2798 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr ""
-#: models.py:2771
+#: models.py:2823
msgid "Is preventive"
msgstr ""
-#: models.py:2775
+#: models.py:2827
msgid "Operation types"
msgstr ""
-#: models.py:2804
+#: models.py:2856
msgid "Preventive"
msgstr ""
-#: models.py:2805
+#: models.py:2857
msgid "Research"
msgstr ""
@@ -1369,104 +1368,104 @@ msgstr ""
msgid "Load another random image?"
msgstr ""
-#: views.py:111
+#: views.py:114
msgid "New person"
msgstr ""
-#: views.py:119
+#: views.py:122
msgid "Person modification"
msgstr ""
-#: views.py:134
+#: views.py:137
msgid "Person deletion"
msgstr ""
-#: views.py:145
+#: views.py:148
msgid "New organization"
msgstr ""
-#: views.py:152
+#: views.py:155
msgid "Organization modification"
msgstr ""
-#: views.py:168
+#: views.py:171
msgid "Organization deletion"
msgstr ""
-#: views.py:175
+#: views.py:178
msgid "Account management"
msgstr ""
-#: views.py:181
+#: views.py:184
msgid "Account deletion"
msgstr ""
-#: views.py:233
+#: views.py:236
msgid "Archaeological file"
msgstr ""
-#: views.py:236
+#: views.py:239
msgid "Context record"
msgstr ""
-#: views.py:238
+#: views.py:241
msgid "Find"
msgstr ""
-#: views.py:1238 views.py:1281
+#: views.py:1249 views.py:1292
msgid "Operation not permitted."
msgstr ""
-#: views.py:1240
+#: views.py:1251
#, python-format
msgid "New %s"
msgstr ""
-#: views.py:1300 views.py:1354
+#: views.py:1311 views.py:1364
msgid "Operations"
msgstr ""
-#: views.py:1553 templates/ishtar/import_list.html:43
+#: views.py:1563 templates/ishtar/import_list.html:43
msgid "Link unmatched items"
msgstr ""
-#: views.py:1568
+#: views.py:1578
msgid "Delete import"
msgstr ""
-#: views.py:1607
+#: views.py:1617
msgid "Merge persons"
msgstr ""
-#: views.py:1631
+#: views.py:1641
msgid "Select the main person"
msgstr ""
-#: views.py:1640
+#: views.py:1650
msgid "Merge organization"
msgstr ""
-#: views.py:1650
+#: views.py:1660
msgid "Select the main organization"
msgstr ""
-#: views.py:1690 views.py:1706
+#: views.py:1700 views.py:1716
msgid "Corporation manager"
msgstr ""
-#: widgets.py:239 widgets.py:347 widgets.py:463
+#: widgets.py:239 widgets.py:347 widgets.py:462
msgid "Search..."
msgstr ""
-#: widgets.py:623 templatetags/window_tables.py:79
+#: widgets.py:642 templatetags/window_tables.py:79
msgid "No results"
msgstr ""
-#: widgets.py:624 templatetags/window_tables.py:80
+#: widgets.py:643 templatetags/window_tables.py:80
msgid "Loading..."
msgstr ""
-#: widgets.py:625
+#: widgets.py:644
msgid "Remove"
msgstr ""
@@ -1478,7 +1477,7 @@ msgstr ""
msgid "No"
msgstr ""
-#: wizards.py:1249
+#: wizards.py:1251
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr ""
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 72a3432f8..5b822c7dd 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -25,6 +25,7 @@ import copy
import datetime
from PIL import Image
from importlib import import_module
+import logging
import os
import re
import shutil
@@ -65,6 +66,9 @@ from ishtar_common.data_importer import Importer, ImportFormater, \
TypeFormater, YearFormater, StrToBoolean, FileFormater
+logger = logging.getLogger(__name__)
+
+
def post_save_user(sender, **kwargs):
user = kwargs['instance']
try:
@@ -95,6 +99,7 @@ class Imported(models.Model):
class ValueGetter(object):
_prefix = ""
GET_VALUES_EXTRA = []
+ EXTRA_FULL_FIELDS_LABELS = {}
def get_values(self, prefix=''):
if not prefix:
@@ -1607,7 +1612,7 @@ def get_importer_models():
('archaeological_context_records.models.RecordRelations',
_(u"Context record relations"))] + MODELS
MODELS = [('archaeological_finds.models.BaseFind',
- _(u"Finds")), ] + MODELS
+ _(u"Base finds")), ] + MODELS
return MODELS
@@ -1995,7 +2000,9 @@ TARGET_MODELS = [
('archaeological_operations.models.OperationType', _(u"Operation type")),
('archaeological_operations.models.Period', _(u"Period")),
('archaeological_operations.models.ReportState', _(u"Report state")),
+ ('archaeological_operations.models.RemainType', _(u"Remain type")),
('archaeological_context_records.models.Unit', _(u"Unit")),
+ ('archaeological_context_records.models.ActivityType', _(u"Activity type")),
('archaeological_finds.models.MaterialType', _(u"Material")),
('archaeological_finds.models.ConservatoryState',
_(u"Conservatory state")),
@@ -2077,7 +2084,9 @@ class FormaterType(models.Model):
kwargs['many_split'] = self.many_split
if self.formater_type == 'TypeFormater':
if self.options not in TARGET_MODELS_KEYS:
- print('%s not in TARGET_MODELS_KEYS' % self.options)
+ logger.warning(
+ "**WARN FormaterType.get_formater_type**: {} "
+ "is not in TARGET_MODELS_KEYS".format(self.options))
return
model = None
if self.options in dir():
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index cd34a2019..8634125cd 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -981,8 +981,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
lnk = link_template % reverse('show-' + default_name,
args=[data[0], ''])
except NoReverseMatch:
- print(
- '"show-' + default_name + "\" args ("
+ logger.warning(
+ '**WARN "show-' + default_name + '" args ('
+ unicode(data[0]) + ") url not available")
lnk = ''
res = {'id': data[0], 'link': lnk}
@@ -1027,6 +1027,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
writer = csv.writer(response, **CSV_OPTIONS)
col_names = []
for field_name in table_cols:
+ if type(field_name) in (list, tuple):
+ field_name = " ; ".join(field_name)
if hasattr(model, 'EXTRA_FULL_FIELDS_LABELS') and\
field_name in model.EXTRA_FULL_FIELDS_LABELS:
field = model.EXTRA_FULL_FIELDS_LABELS[field_name]
@@ -1037,6 +1039,11 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
field = model._meta.get_field(field_name)
except:
col_names.append(u"".encode(ENCODING))
+ logger.warning(
+ "**WARN get_item - csv export**: no col name for "
+ "{}\nadd explicit label to "
+ "EXTRA_FULL_FIELDS_LABELS attribute of "
+ "{}".format(field_name, model))
continue
col_names.append(
unicode(field.verbose_name).encode(ENCODING))
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 06:00:42 +0000