diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/locale/django.pot | 190 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 5 | 
2 files changed, 100 insertions, 95 deletions
| diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index f9dfefd01..f2c9900c2 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -5,6 +5,7 @@  # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata  # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata  # Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata  msgid ""  msgstr "" @@ -21,7 +22,7 @@ msgid "Polygon"  msgstr ""  #: forms.py:97 forms.py:103 forms.py:371 models_finds.py:581 -#: models_finds.py:875 wizards.py:64 +#: models_finds.py:877 wizards.py:64  msgid "Context record"  msgstr "" @@ -29,8 +30,8 @@ msgstr ""  msgid "Find - 010 - Context record choice"  msgstr "" -#: forms.py:132 ishtar_menu.py:32 models_finds.py:785 models_finds.py:1397 -#: models_finds.py:1418 models_treatments.py:311 +#: forms.py:132 ishtar_menu.py:32 models_finds.py:787 models_finds.py:1399 +#: models_finds.py:1420 models_treatments.py:311  #: templates/ishtar/sheet_find.html:4  msgid "Find"  msgstr "" @@ -40,16 +41,16 @@ msgid "Find - 020 - General"  msgstr ""  #: forms.py:145 forms.py:353 forms.py:636 models_finds.py:210 -#: models_finds.py:679 templates/ishtar/sheet_find.html:18 +#: models_finds.py:681 templates/ishtar/sheet_find.html:18  msgid "Free ID"  msgstr "" -#: forms.py:147 models_finds.py:731 +#: forms.py:147 models_finds.py:733  msgid "Previous ID"  msgstr ""  #: forms.py:148 forms.py:393 forms_treatments.py:138 models_finds.py:214 -#: models_finds.py:680 models_treatments.py:111 +#: models_finds.py:682 models_treatments.py:111  msgid "Description"  msgstr "" @@ -61,7 +62,7 @@ msgstr ""  msgid "Batch/object"  msgstr "" -#: forms.py:155 models_finds.py:703 +#: forms.py:155 models_finds.py:705  msgid "Is complete?"  msgstr "" @@ -69,15 +70,15 @@ msgstr ""  msgid "Material type"  msgstr "" -#: forms.py:161 models_finds.py:135 models_finds.py:602 models_finds.py:706 +#: forms.py:161 models_finds.py:135 models_finds.py:602 models_finds.py:708  msgid "Object types"  msgstr "" -#: forms.py:164 forms.py:389 models_finds.py:710 +#: forms.py:164 forms.py:389 models_finds.py:712  msgid "Integrity / interest"  msgstr "" -#: forms.py:167 forms.py:391 models_finds.py:713 +#: forms.py:167 forms.py:391 models_finds.py:715  msgid "Remarkability"  msgstr "" @@ -85,15 +86,15 @@ msgstr ""  msgid "Point of topographic reference"  msgstr "" -#: forms.py:173 models_finds.py:230 templates/ishtar/sheet_find.html:218 +#: forms.py:173 models_finds.py:230 templates/ishtar/sheet_find.html:220  msgid "X"  msgstr "" -#: forms.py:174 models_finds.py:231 templates/ishtar/sheet_find.html:219 +#: forms.py:174 models_finds.py:231 templates/ishtar/sheet_find.html:221  msgid "Y"  msgstr "" -#: forms.py:175 models_finds.py:232 templates/ishtar/sheet_find.html:220 +#: forms.py:175 models_finds.py:232 templates/ishtar/sheet_find.html:222  msgid "Z"  msgstr "" @@ -113,69 +114,69 @@ msgstr ""  msgid "Estimated error for Z"  msgstr "" -#: forms.py:185 models_finds.py:720 +#: forms.py:185 models_finds.py:722  msgid "Length (cm)"  msgstr "" -#: forms.py:186 models_finds.py:721 +#: forms.py:186 models_finds.py:723  msgid "Width (cm)"  msgstr "" -#: forms.py:187 models_finds.py:722 +#: forms.py:187 models_finds.py:724  msgid "Height (cm)"  msgstr "" -#: forms.py:188 models_finds.py:723 +#: forms.py:188 models_finds.py:725  msgid "Diameter (cm)"  msgstr "" -#: forms.py:189 models_finds.py:724 +#: forms.py:189 models_finds.py:726  msgid "Thickness (cm)"  msgstr "" -#: forms.py:190 forms.py:641 models_finds.py:685 +#: forms.py:190 forms.py:641 models_finds.py:687  msgid "Volume (l)"  msgstr "" -#: forms.py:191 forms.py:642 models_finds.py:686 +#: forms.py:191 forms.py:642 models_finds.py:688  msgid "Weight (g)"  msgstr "" -#: forms.py:193 models_finds.py:725 +#: forms.py:193 models_finds.py:727  msgid "Dimensions comment"  msgstr "" -#: forms.py:194 forms.py:643 models_finds.py:689 +#: forms.py:194 forms.py:643 models_finds.py:691  msgid "Find number"  msgstr "" -#: forms.py:196 models_finds.py:719 +#: forms.py:196 models_finds.py:721  msgid "Minimum number of individuals (MNI)"  msgstr "" -#: forms.py:197 models_finds.py:727 +#: forms.py:197 models_finds.py:729  msgid "Mark"  msgstr "" -#: forms.py:198 forms.py:396 models_finds.py:733 +#: forms.py:198 forms.py:396 models_finds.py:735  msgid "Check"  msgstr "" -#: forms.py:200 models_finds.py:735 +#: forms.py:200 models_finds.py:737  msgid "Check date"  msgstr ""  #: forms.py:201 forms_treatments.py:140 forms_treatments.py:488 -#: models_finds.py:215 models_finds.py:728 models_treatments.py:110 +#: models_finds.py:215 models_finds.py:730 models_treatments.py:110  #: models_treatments.py:530  msgid "Comment"  msgstr "" -#: forms.py:204 models_finds.py:729 +#: forms.py:204 models_finds.py:731  msgid "Comment on dating"  msgstr "" -#: forms.py:205 models_finds.py:737 +#: forms.py:205 models_finds.py:739  msgid "Estimated value"  msgstr "" @@ -198,7 +199,7 @@ msgstr ""  msgid "Coordinates are not relevant for the spatial reference system used: {}."  msgstr "" -#: forms.py:273 templates/ishtar/sheet_find.html:71 +#: forms.py:273 templates/ishtar/sheet_find.html:72  msgid "Preservation"  msgstr "" @@ -206,39 +207,39 @@ msgstr ""  msgid "Find - 030 - Preservation"  msgstr "" -#: forms.py:284 forms.py:387 models_finds.py:63 models_finds.py:745 +#: forms.py:284 forms.py:387 models_finds.py:63 models_finds.py:747  msgid "Conservatory state"  msgstr "" -#: forms.py:287 models_finds.py:754 +#: forms.py:287 models_finds.py:756  msgid "Alteration"  msgstr "" -#: forms.py:290 models_finds.py:758 +#: forms.py:290 models_finds.py:760  msgid "Alteration cause"  msgstr "" -#: forms.py:293 models_finds.py:751 +#: forms.py:293 models_finds.py:753  msgid "Recommended treatments"  msgstr "" -#: forms.py:295 models_finds.py:762 +#: forms.py:295 models_finds.py:764  msgid "Treatment emergency"  msgstr "" -#: forms.py:297 models_finds.py:765 +#: forms.py:297 models_finds.py:767  msgid "Insurance value"  msgstr "" -#: forms.py:299 models_finds.py:767 +#: forms.py:299 models_finds.py:769  msgid "Appraisal date"  msgstr "" -#: forms.py:301 models_finds.py:747 +#: forms.py:301 models_finds.py:749  msgid "Conservatory comment"  msgstr "" -#: forms.py:320 forms.py:344 models_finds.py:697 +#: forms.py:320 forms.py:344 models_finds.py:699  msgid "Dating"  msgstr "" @@ -247,14 +248,14 @@ msgid "Period"  msgstr ""  #: forms.py:326 forms_treatments.py:142 forms_treatments.py:290 -#: forms_treatments.py:490 models_finds.py:1423 models_treatments.py:113 -#: models_treatments.py:322 templates/ishtar/sheet_find.html:110 -#: templates/ishtar/sheet_find.html:148 +#: forms_treatments.py:490 models_finds.py:1425 models_treatments.py:113 +#: models_treatments.py:322 templates/ishtar/sheet_find.html:111 +#: templates/ishtar/sheet_find.html:149  msgid "Start date"  msgstr "" -#: forms.py:328 models_finds.py:1424 models_treatments.py:323 -#: templates/ishtar/sheet_find.html:111 templates/ishtar/sheet_find.html:149 +#: forms.py:328 models_finds.py:1426 models_treatments.py:323 +#: templates/ishtar/sheet_find.html:112 templates/ishtar/sheet_find.html:150  msgid "End date"  msgstr "" @@ -350,7 +351,7 @@ msgstr ""  msgid "Upstream finds"  msgstr "" -#: forms.py:518 models_finds.py:786 +#: forms.py:518 models_finds.py:788  msgid "Finds"  msgstr "" @@ -423,7 +424,7 @@ msgid "Basket"  msgstr ""  #: forms_treatments.py:53 forms_treatments.py:96 models_treatments.py:83 -#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:142 +#: templates/ishtar/sheet_find.html:105 templates/ishtar/sheet_find.html:143  msgid "Label"  msgstr "" @@ -457,7 +458,7 @@ msgid "Treatment - 020 - General"  msgstr ""  #: forms_treatments.py:107 models_treatments.py:71 models_treatments.py:95 -#: templates/ishtar/sheet_find.html:106 templates/ishtar/sheet_find.html:144 +#: templates/ishtar/sheet_find.html:107 templates/ishtar/sheet_find.html:145  msgid "State"  msgstr "" @@ -638,8 +639,8 @@ msgid "Internal ref."  msgstr ""  #: forms_treatments.py:411 forms_treatments.py:469 models_treatments.py:70 -#: templates/ishtar/sheet_find.html:105 templates/ishtar/sheet_find.html:143 -#: templates/ishtar/sheet_find.html:241 +#: templates/ishtar/sheet_find.html:106 templates/ishtar/sheet_find.html:144 +#: templates/ishtar/sheet_find.html:243  msgid "Type"  msgstr "" @@ -744,12 +745,12 @@ msgstr ""  msgid "Documentation"  msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1420 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1422  msgid "Administrative act"  msgstr "" -#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:235 -#: templates/ishtar/sheet_find.html:237 +#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:237 +#: templates/ishtar/sheet_find.html:239  msgid "Documents"  msgstr "" @@ -775,7 +776,7 @@ msgstr ""  msgid "Recommendation"  msgstr "" -#: models_finds.py:53 models_finds.py:601 models_finds.py:682 +#: models_finds.py:53 models_finds.py:601 models_finds.py:684  msgid "Material types"  msgstr "" @@ -783,7 +784,7 @@ msgstr ""  msgid "Conservatory states"  msgstr "" -#: models_finds.py:73 models_finds.py:121 models_finds.py:678 +#: models_finds.py:73 models_finds.py:121 models_finds.py:680  #: models_treatments.py:317  msgid "Order"  msgstr "" @@ -865,21 +866,19 @@ msgid "Treatment emergency types"  msgstr ""  #: models_finds.py:178 -#| msgid "Remarkability type"  msgid "Communicability type"  msgstr ""  #: models_finds.py:179 -#| msgid "Remarkability types"  msgid "Communicability types"  msgstr "" -#: models_finds.py:211 models_finds.py:675 models_treatments.py:108 +#: models_finds.py:211 models_finds.py:677 models_treatments.py:108  #: models_treatments.py:507  msgid "External ID"  msgstr "" -#: models_finds.py:213 models_finds.py:677 +#: models_finds.py:213 models_finds.py:679  msgid "External ID is set automatically"  msgstr "" @@ -903,7 +902,7 @@ msgstr ""  msgid "Cached value - do not edit"  msgstr "" -#: models_finds.py:260 models_finds.py:673 +#: models_finds.py:260 models_finds.py:675  msgid "Base find"  msgstr "" @@ -979,9 +978,9 @@ msgstr ""  msgid "Base find - Discovery date"  msgstr "" -#: models_finds.py:599 models_finds.py:700 models_treatments.py:115 -#: models_treatments.py:325 templates/ishtar/sheet_find.html:109 -#: templates/ishtar/sheet_find.html:147 +#: models_finds.py:599 models_finds.py:702 models_treatments.py:115 +#: models_treatments.py:325 templates/ishtar/sheet_find.html:110 +#: templates/ishtar/sheet_find.html:148  msgid "Container"  msgstr "" @@ -989,67 +988,67 @@ msgstr ""  msgid "Periods"  msgstr "" -#: models_finds.py:687 +#: models_finds.py:689  msgid "Weight unit"  msgstr "" -#: models_finds.py:693 templates/ishtar/sheet_find.html:99 +#: models_finds.py:695 templates/ishtar/sheet_find.html:100  msgid "Upstream treatment"  msgstr "" -#: models_finds.py:696 templates/ishtar/sheet_find.html:137 +#: models_finds.py:698 templates/ishtar/sheet_find.html:138  msgid "Downstream treatment"  msgstr "" -#: models_finds.py:716 +#: models_finds.py:718  msgid "Communicability"  msgstr "" -#: models_finds.py:740 +#: models_finds.py:742  msgid "Collection"  msgstr "" -#: models_finds.py:769 models_treatments.py:127 +#: models_finds.py:771 models_treatments.py:127  msgid "Images"  msgstr "" -#: models_finds.py:771 models_treatments.py:129 models_treatments.py:531 +#: models_finds.py:773 models_treatments.py:129 models_treatments.py:531  msgid "Cached name"  msgstr "" -#: models_finds.py:798 +#: models_finds.py:800  msgid "FIND"  msgstr "" -#: models_finds.py:884 wizards.py:63 wizards.py:200 +#: models_finds.py:886 wizards.py:63 wizards.py:200  msgid "Operation"  msgstr "" -#: models_finds.py:1183 +#: models_finds.py:1185  msgid "No container have been set - the localisation cannot be set."  msgstr "" -#: models_finds.py:1189 +#: models_finds.py:1191  msgid "The division number {} have not been set for the warehouse {}."  msgstr "" -#: models_finds.py:1383 +#: models_finds.py:1385  msgid "Find documentation"  msgstr "" -#: models_finds.py:1384 +#: models_finds.py:1386  msgid "Find documentations"  msgstr "" -#: models_finds.py:1421 +#: models_finds.py:1423  msgid "Person"  msgstr "" -#: models_finds.py:1427 +#: models_finds.py:1429  msgid "Property"  msgstr "" -#: models_finds.py:1428 +#: models_finds.py:1430  msgid "Properties"  msgstr "" @@ -1089,7 +1088,7 @@ msgstr ""  msgid "Target a basket"  msgstr "" -#: models_treatments.py:135 templates/ishtar/sheet_find.html:96 +#: models_treatments.py:135 templates/ishtar/sheet_find.html:97  #: templates/ishtar/sheet_treatmentfile.html:61  msgid "Treatments"  msgstr "" @@ -1102,8 +1101,8 @@ msgstr ""  msgid "Downstream finds"  msgstr "" -#: models_treatments.py:326 templates/ishtar/sheet_find.html:108 -#: templates/ishtar/sheet_find.html:146 +#: models_treatments.py:326 templates/ishtar/sheet_find.html:109 +#: templates/ishtar/sheet_find.html:147  msgid "Doer"  msgstr "" @@ -1165,51 +1164,56 @@ msgstr ""  msgid "Administrative index"  msgstr "" -#: templates/ishtar/sheet_find.html:85 +#: templates/ishtar/sheet_find.html:58 +#| msgid "Check" +msgid "Checked" +msgstr "" + +#: templates/ishtar/sheet_find.html:86  msgid "Warehouse"  msgstr "" -#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:141 +#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:142  msgid "Year - index"  msgstr "" -#: templates/ishtar/sheet_find.html:107 templates/ishtar/sheet_find.html:145 +#: templates/ishtar/sheet_find.html:108 templates/ishtar/sheet_find.html:146  msgid "Related finds (max. 15 displayed)"  msgstr "" -#: templates/ishtar/sheet_find.html:133 +#: templates/ishtar/sheet_find.html:134  msgid "Export as CSV"  msgstr "" -#: templates/ishtar/sheet_find.html:133 templates/ishtar/sheet_find.html:172 +#: templates/ishtar/sheet_find.html:134 templates/ishtar/sheet_find.html:173  msgid "CSV"  msgstr "" -#: templates/ishtar/sheet_find.html:177 +#: templates/ishtar/sheet_find.html:178  msgid "Associated base finds"  msgstr "" -#: templates/ishtar/sheet_find.html:184 +#: templates/ishtar/sheet_find.html:185  msgid "Internal ID"  msgstr "" -#: templates/ishtar/sheet_find.html:216 +#: templates/ishtar/sheet_find.html:218  msgid "Coordinates"  msgstr "" -#: templates/ishtar/sheet_find.html:223 +#: templates/ishtar/sheet_find.html:225  msgid "SRID"  msgstr "" -#: templates/ishtar/sheet_find.html:240 +#: templates/ishtar/sheet_find.html:242  msgid "Title"  msgstr "" -#: templates/ishtar/sheet_find.html:242 +#: templates/ishtar/sheet_find.html:244  msgid "Authors"  msgstr "" -#: templates/ishtar/sheet_find.html:243 +#: templates/ishtar/sheet_find.html:245  msgid "Link"  msgstr "" diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 79d581c6d..0bc26b58c 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -55,11 +55,12 @@      {% field_flex_multiple "Remarkability" item.remarkabilities %}      {% field_flex_multiple "Communicability" item.communicabilities %}      {% field_flex "Estimated value" item.estimated_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %} +    {% trans "Checked" as checked_label %}      {% if item.CHECK_DICT %} -    {% field_flex "Checked" item.checked|from_dict:item.CHECK_DICT %} +    {% field_flex checked_label item.checked|from_dict:item.CHECK_DICT %}      {% endif%}      {% if item.history_object and item.history_object.CHECK_DICT %} -    {% field_flex "Checked" item.checked|from_dict:item.history_object.CHECK_DICT %} +    {% field_flex checked_label item.checked|from_dict:item.history_object.CHECK_DICT %}      {% endif%}      {% field_flex_full "Description" item.description "<pre>" "</pre>" %}      {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} | 
