summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/forms.py12
-rw-r--r--archaeological_operations/locale/django.pot226
-rw-r--r--archaeological_operations/models.py6
3 files changed, 122 insertions, 122 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 994ff4214..3103990c9 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -484,7 +484,7 @@ class OperationSelect(TableSelect):
widget=OAWidget,
label="Code PATRIARCHE")
drassm_code = forms.CharField(
- label=_(u"Code DRASSM"), required=False, max_length=100)
+ label=_(u"DRASSM code"), required=False, max_length=100)
towns = get_town_field()
parcel = forms.CharField(label=_(u"Parcel"))
if settings.ISHTAR_DPTS:
@@ -758,7 +758,7 @@ class OperationFormGeneral(CustomForm, ManageOldType):
widget=OAWidget,
required=False)
drassm_code = forms.CharField(
- label=_(u"Code DRASSM"), required=False, max_length=100)
+ label=_(u"DRASSM code"), required=False, max_length=100)
operation_type = forms.ChoiceField(label=_(u"Operation type"),
choices=[])
common_name = forms.CharField(label=_(u"Generic name"), required=False,
@@ -1271,9 +1271,9 @@ class SiteSelect(TableSelect):
required=False)
affmar_number = forms.CharField(
- label=_(u"Numéro AffMar"), required=False, max_length=100)
+ label=_(u"AffMar number"), required=False, max_length=100)
drassm_number = forms.CharField(
- label=_(u"Numéro DRASSM"), required=False, max_length=100)
+ label=_(u"DRASSM number"), required=False, max_length=100)
shipwreck_name = forms.CharField(
label=_(u"Shipwreck name"), max_length=200,
required=False)
@@ -1393,9 +1393,9 @@ class SiteUnderwaterForm(CustomForm, ManageOldType):
form_slug = u"archaeological_site-030-underwater"
affmar_number = forms.CharField(
- label=_(u"Numéro AffMar"), required=False, max_length=100)
+ label=_(u"AffMar number"), required=False, max_length=100)
drassm_number = forms.CharField(
- label=_(u"Numéro DRASSM"), required=False, max_length=100)
+ label=_(u"DRASSM number"), required=False, max_length=100)
shipwreck_name = forms.CharField(
label=_(u"Shipwreck name"), required=False)
shipwreck_code = forms.CharField(
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index b4d0594db..0ba3360c7 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/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 ""
@@ -16,13 +17,13 @@ msgstr ""
msgid "Multi polygon"
msgstr ""
-#: forms.py:64 forms.py:1068 forms.py:1084 forms.py:1090 models.py:2003
+#: forms.py:64 forms.py:1068 forms.py:1084 forms.py:1090 models.py:2014
#: templates/ishtar/blocks/window_tables/parcels.html:9
#: templates/ishtar/sheet_operation.html:257
msgid "Parcels"
msgstr ""
-#: forms.py:67 forms.py:200 forms.py:1043 models.py:1987
+#: forms.py:67 forms.py:200 forms.py:1043 models.py:1998
#: templates/ishtar/blocks/window_tables/parcels.html:6
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -32,21 +33,21 @@ msgid "Town"
msgstr ""
#: forms.py:69 forms.py:480 forms.py:768 forms.py:1426 models.py:774
-#: models.py:1561 models.py:1768 models.py:1985
+#: models.py:1562 models.py:1769 models.py:1996
#: templates/ishtar/blocks/window_tables/parcels.html:7
msgid "Year"
msgstr ""
-#: forms.py:72 models.py:1988
+#: forms.py:72 models.py:1999
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Section"
msgstr ""
-#: forms.py:75 models.py:1990
+#: forms.py:75 models.py:2001
msgid "Parcel number"
msgstr ""
-#: forms.py:77 models.py:1992 models.py:2011 models.py:2072
+#: forms.py:77 models.py:2003 models.py:2022 models.py:2083
msgid "Public domain"
msgstr ""
@@ -83,7 +84,7 @@ msgid "Relation type"
msgstr ""
#: forms.py:373 forms.py:1261 ishtar_menu.py:32 models.py:886 models.py:1466
-#: models.py:1477 models.py:1563 models.py:1750 models.py:1984
+#: models.py:1477 models.py:1564 models.py:1751 models.py:1995
#: templates/ishtar/sheet_operation.html:4 wizards.py:320 wizards.py:331
msgid "Operation"
msgstr ""
@@ -129,10 +130,10 @@ msgid "Numeric reference"
msgstr ""
#: forms.py:487 forms.py:761 models.py:870
-msgid "Code DRASSM"
+msgid "DRASSM code"
msgstr ""
-#: forms.py:489 forms.py:1071 forms.py:1438 models.py:2002 models.py:2214
+#: forms.py:489 forms.py:1071 forms.py:1438 models.py:2013 models.py:2225
msgid "Parcel"
msgstr ""
@@ -167,7 +168,7 @@ msgstr ""
msgid "In charge"
msgstr ""
-#: forms.py:511 models.py:1744
+#: forms.py:511 models.py:1745
msgid "Scientist in charge"
msgstr ""
@@ -268,7 +269,7 @@ msgstr ""
msgid "Finds deadline after"
msgstr ""
-#: forms.py:599 views.py:182
+#: forms.py:599 views.py:183
msgid "Operation search"
msgstr ""
@@ -276,8 +277,8 @@ msgstr ""
msgid "Associated file"
msgstr ""
-#: forms.py:647 forms.py:944 models.py:1083 models.py:1476 models.py:1562
-#: models.py:1755 wizards.py:83
+#: forms.py:647 forms.py:944 models.py:1083 models.py:1476 models.py:1563
+#: models.py:1756 wizards.py:83
msgid "Archaeological file"
msgstr ""
@@ -379,7 +380,7 @@ msgstr ""
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:812 models.py:57 models.py:754 models.py:2216
+#: forms.py:812 models.py:57 models.py:754 models.py:2227
msgid "Start date"
msgstr ""
@@ -497,7 +498,7 @@ msgid "Prescription on geoarchaeological context"
msgstr ""
#: forms.py:1041 forms.py:1057 forms.py:1062 forms.py:1381 models.py:131
-#: models.py:230 models.py:541 models.py:786 models.py:1778
+#: models.py:230 models.py:541 models.py:786 models.py:1779
msgid "Towns"
msgstr ""
@@ -559,7 +560,7 @@ msgstr ""
msgid "Associated archaeological sites"
msgstr ""
-#: forms.py:1223 ishtar_menu.py:36 ishtar_menu.py:66 ishtar_menu.py:113
+#: forms.py:1223 ishtar_menu.py:36 ishtar_menu.py:66 ishtar_menu.py:108
msgid "Search"
msgstr ""
@@ -584,11 +585,12 @@ msgid "Cadastral locality"
msgstr ""
#: forms.py:1274 forms.py:1396 models.py:257
-msgid "Numro AffMar"
+#| msgid "Parcel number"
+msgid "AffMar number"
msgstr ""
#: forms.py:1276 forms.py:1398 models.py:259
-msgid "Numro DRASSM"
+msgid "DRASSM number"
msgstr ""
#: forms.py:1278 forms.py:1400 models.py:248
@@ -631,11 +633,11 @@ msgstr ""
msgid "Archaeological site - 030 - Underwater"
msgstr ""
-#: forms.py:1427 forms.py:1561 models.py:1735
+#: forms.py:1427 forms.py:1561 models.py:1736
msgid "Index"
msgstr ""
-#: forms.py:1435 forms.py:1495 models.py:1490 models.py:1729
+#: forms.py:1435 forms.py:1495 models.py:1490 models.py:1730
msgid "Act type"
msgstr ""
@@ -643,12 +645,12 @@ msgstr ""
msgid "Indexed?"
msgstr ""
-#: forms.py:1442 forms.py:1500 models.py:1769
+#: forms.py:1442 forms.py:1500 models.py:1770
#: templates/ishtar/blocks/window_tables/administrativacts.html:9
msgid "Object"
msgstr ""
-#: forms.py:1472 views.py:412
+#: forms.py:1472 views.py:413
msgid "Administrative act search"
msgstr ""
@@ -656,7 +658,7 @@ msgstr ""
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1503 models.py:1766
+#: forms.py:1503 models.py:1767
msgid "Signature date"
msgstr ""
@@ -695,16 +697,16 @@ msgstr ""
msgid "Generate the associated doc?"
msgstr ""
-#: forms.py:1640 ishtar_menu.py:101 views.py:465
+#: forms.py:1640 ishtar_menu.py:96 views.py:466
msgctxt "admin act register"
msgid "Register"
msgstr ""
-#: ishtar_menu.py:41 ishtar_menu.py:72 ishtar_menu.py:118
+#: ishtar_menu.py:41 ishtar_menu.py:72 ishtar_menu.py:113
msgid "Creation"
msgstr ""
-#: ishtar_menu.py:46 ishtar_menu.py:77 ishtar_menu.py:123
+#: ishtar_menu.py:46 ishtar_menu.py:77 ishtar_menu.py:118
msgid "Modification"
msgstr ""
@@ -712,42 +714,38 @@ msgstr ""
msgid "Closing"
msgstr ""
-#: ishtar_menu.py:55 ishtar_menu.py:82 ishtar_menu.py:128
+#: ishtar_menu.py:55 ishtar_menu.py:82 ishtar_menu.py:123
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:61 models.py:1785
+#: ishtar_menu.py:61 models.py:1786
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr ""
-#: ishtar_menu.py:87 models.py:268 models.py:843
-msgid "Documents"
-msgstr ""
-
-#: ishtar_menu.py:95
+#: ishtar_menu.py:90
msgid "Administrative Act"
msgstr ""
-#: ishtar_menu.py:135
+#: ishtar_menu.py:130
msgid "Dashboard"
msgstr ""
-#: ishtar_menu.py:139
+#: ishtar_menu.py:134
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:143 models.py:887
+#: ishtar_menu.py:138 models.py:887
#: templates/ishtar/dashboards/dashboard_operation.html:8
#: templates/ishtar/sheet_site.html:68
msgid "Operations"
msgstr ""
-#: models.py:56 models.py:76 models.py:94 models.py:2694
+#: models.py:56 models.py:76 models.py:94 models.py:2705
msgid "Order"
msgstr ""
-#: models.py:58 models.py:2217
+#: models.py:58 models.py:2228
msgid "End date"
msgstr ""
@@ -864,7 +862,11 @@ msgctxt "key for text search"
msgid "numero-affmar"
msgstr ""
-#: models.py:270 models.py:845 models.py:1998
+#: models.py:268 models.py:843
+msgid "Documents"
+msgstr ""
+
+#: models.py:270 models.py:845 models.py:2009
msgid "Cached name"
msgstr ""
@@ -932,7 +934,7 @@ msgstr ""
msgid "Archaeological sites (reference)"
msgstr ""
-#: models.py:581 models.py:1574 tests.py:1628 tests.py:1673
+#: models.py:581 models.py:1575 tests.py:1628 tests.py:1673
msgctxt "key for text search"
msgid "year"
msgstr ""
@@ -942,12 +944,12 @@ msgctxt "key for text search"
msgid "operation-code"
msgstr ""
-#: models.py:589 models.py:1586
+#: models.py:589 models.py:1587
msgctxt "key for text search"
msgid "patriarche"
msgstr ""
-#: models.py:597 models.py:1606
+#: models.py:597 models.py:1607
msgctxt "key for text search"
msgid "parcel"
msgstr ""
@@ -962,7 +964,7 @@ msgctxt "key for text search"
msgid "address"
msgstr ""
-#: models.py:613 models.py:1590
+#: models.py:613 models.py:1591
msgctxt "key for text search"
msgid "type"
msgstr ""
@@ -1042,12 +1044,12 @@ msgctxt "key for text search"
msgid "site"
msgstr ""
-#: models.py:693 models.py:1624
+#: models.py:693 models.py:1625
msgctxt "key for text search"
msgid "created-by"
msgstr ""
-#: models.py:697 models.py:1628
+#: models.py:697 models.py:1629
msgctxt "key for text search"
msgid "modified-by"
msgstr ""
@@ -1100,7 +1102,7 @@ msgstr ""
msgid "In charge scientist"
msgstr ""
-#: models.py:779 models.py:1980
+#: models.py:779 models.py:1991
msgid "File"
msgstr ""
@@ -1122,12 +1124,10 @@ msgid "Intercommunal"
msgstr ""
#: models.py:1078
-#| msgid "Context records"
msgid "Add context record"
msgstr ""
#: models.py:1079
-#| msgid "Context records"
msgid "context record"
msgstr ""
@@ -1189,11 +1189,11 @@ msgstr ""
msgid "Operation record relations"
msgstr ""
-#: models.py:1478 models.py:1760
+#: models.py:1478 models.py:1761
msgid "Treatment request"
msgstr ""
-#: models.py:1479 models.py:1765
+#: models.py:1479 models.py:1766
msgid "Treatment"
msgstr ""
@@ -1217,246 +1217,246 @@ msgstr ""
msgid "Act types"
msgstr ""
-#: models.py:1561 models.py:1806
+#: models.py:1562 models.py:1807
#: templates/ishtar/blocks/window_tables/administrativacts.html:6
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6
msgid "Ref."
msgstr ""
-#: models.py:1578
+#: models.py:1579
msgctxt "key for text search"
msgid "index"
msgstr ""
-#: models.py:1582
+#: models.py:1583
msgctxt "key for text search"
msgid "other-ref"
msgstr ""
-#: models.py:1594
+#: models.py:1595
msgctxt "key for text search"
msgid "indexed"
msgstr ""
-#: models.py:1598
+#: models.py:1599
msgctxt "key for text search"
msgid "operation-town"
msgstr ""
-#: models.py:1602
+#: models.py:1603
msgctxt "key for text search"
msgid "file-town"
msgstr ""
-#: models.py:1612
+#: models.py:1613
msgctxt "key for text search"
msgid "operation-department"
msgstr ""
-#: models.py:1616
+#: models.py:1617
msgctxt "key for text search"
msgid "file-department"
msgstr ""
-#: models.py:1620
+#: models.py:1621
msgctxt "key for text search"
msgid "object"
msgstr ""
-#: models.py:1632
+#: models.py:1633
msgctxt "key for text search"
msgid "signature-before"
msgstr ""
-#: models.py:1636
+#: models.py:1637
msgctxt "key for text search"
msgid "signature-after"
msgstr ""
-#: models.py:1640
+#: models.py:1641
msgctxt "key for text search"
msgid "file-name"
msgstr ""
-#: models.py:1644
+#: models.py:1645
msgctxt "key for text search"
msgid "general-contractor"
msgstr ""
-#: models.py:1649
+#: models.py:1650
msgctxt "key for text search"
msgid "general-contractor-organization"
msgstr ""
-#: models.py:1654
+#: models.py:1655
msgctxt "key for text search"
msgid "file-reference"
msgstr ""
-#: models.py:1658
+#: models.py:1659
msgctxt "key for text search"
msgid "file-year"
msgstr ""
-#: models.py:1662
+#: models.py:1663
msgctxt "key for text search"
msgid "file-other-reference"
msgstr ""
-#: models.py:1666
+#: models.py:1667
msgctxt "key for text search"
msgid "file-in-charge"
msgstr ""
-#: models.py:1670
+#: models.py:1671
msgctxt "key for text search"
msgid "file-permit-reference"
msgstr ""
-#: models.py:1674
+#: models.py:1675
msgctxt "key for text search"
msgid "treatment-name"
msgstr ""
-#: models.py:1678
+#: models.py:1679
msgctxt "key for text search"
msgid "treatment-reference"
msgstr ""
-#: models.py:1682
+#: models.py:1683
msgctxt "key for text search"
msgid "treatment-year"
msgstr ""
-#: models.py:1686
+#: models.py:1687
msgctxt "key for text search"
msgid "treatment-index"
msgstr ""
-#: models.py:1690
+#: models.py:1691
msgctxt "key for text search"
msgid "treatment-type"
msgstr ""
-#: models.py:1694
+#: models.py:1695
msgctxt "key for text search"
msgid "treatment-file-name"
msgstr ""
-#: models.py:1698
+#: models.py:1699
msgctxt "key for text search"
msgid "treatment-file-reference"
msgstr ""
-#: models.py:1702
+#: models.py:1703
msgctxt "key for text search"
msgid "treatment-file-year"
msgstr ""
-#: models.py:1706
+#: models.py:1707
msgctxt "key for text search"
msgid "treatment-file-index"
msgstr ""
-#: models.py:1710
+#: models.py:1711
msgctxt "key for text search"
msgid "treatment-file-type"
msgstr ""
-#: models.py:1733
+#: models.py:1734
msgid "Person in charge of the operation"
msgstr ""
-#: models.py:1739
+#: models.py:1740
msgid "Archaeological preventive operator"
msgstr ""
-#: models.py:1747
+#: models.py:1748
msgid "Signatory"
msgstr ""
-#: models.py:1775
+#: models.py:1776
msgid "Departments"
msgstr ""
-#: models.py:1776
+#: models.py:1777
msgid "Cached values get from associated departments"
msgstr ""
-#: models.py:1779
+#: models.py:1780
msgid "Cached values get from associated towns"
msgstr ""
-#: models.py:1786 templates/ishtar/sheet_operation.html:205
+#: models.py:1787 templates/ishtar/sheet_operation.html:205
#: templates/ishtar/sheet_operation.html:251
msgid "Administrative acts"
msgstr ""
-#: models.py:1909
+#: models.py:1920
msgid "This index already exists for this year"
msgstr ""
-#: models.py:1993
+#: models.py:2004
msgid "External ID"
msgstr ""
-#: models.py:1996
+#: models.py:2007
msgid "External ID is set automatically"
msgstr ""
-#: models.py:1997
+#: models.py:2008
msgid "Address - Locality"
msgstr ""
-#: models.py:2212
+#: models.py:2223
msgid "Owner"
msgstr ""
-#: models.py:2220
+#: models.py:2231
msgid "Parcel owner"
msgstr ""
-#: models.py:2221
+#: models.py:2232
msgid "Parcel owners"
msgstr ""
-#: models.py:2255
+#: models.py:2266
msgid "Recorded"
msgstr ""
-#: models.py:2256
+#: models.py:2267
msgid "Effective"
msgstr ""
-#: models.py:2257
+#: models.py:2268
msgid "Active"
msgstr ""
-#: models.py:2258
+#: models.py:2269
msgid "Field completed"
msgstr ""
-#: models.py:2259
+#: models.py:2270
msgid "Associated report"
msgstr ""
-#: models.py:2260
+#: models.py:2271
msgid "Closed"
msgstr ""
-#: models.py:2261
+#: models.py:2272
msgid "Documented and closed"
msgstr ""
-#: models.py:2695
+#: models.py:2706
msgid "Is preventive"
msgstr ""
-#: models.py:2698
+#: models.py:2709
msgid "Operation type old"
msgstr ""
-#: models.py:2699
+#: models.py:2710
msgid "Operation types old"
msgstr ""
@@ -1838,43 +1838,43 @@ msgid ""
"The following error(s) has been encountered while parsing the source file:"
msgstr ""
-#: views.py:244
+#: views.py:245
msgid "New operation"
msgstr ""
-#: views.py:293
+#: views.py:294
msgid "Operation modification"
msgstr ""
-#: views.py:304
+#: views.py:305
msgid "You don't have sufficient permissions to do this action."
msgstr ""
-#: views.py:329
+#: views.py:330
msgid "Operation closing"
msgstr ""
-#: views.py:340
+#: views.py:341
msgid "Operation deletion"
msgstr ""
-#: views.py:406
+#: views.py:407
msgid "Site deletion"
msgstr ""
-#: views.py:425
+#: views.py:426
msgid "Operation: new administrative act"
msgstr ""
-#: views.py:435
+#: views.py:436
msgid "Operation: administrative act modification"
msgstr ""
-#: views.py:459
+#: views.py:460
msgid "Operation: administrative act deletion"
msgstr ""
-#: views.py:552
+#: views.py:530
msgid ""
"Syntax error on the source template \"{}\" - contact your administrator and "
"ask him to check the syntax of this document."
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 22d724bda..de40657ab 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -254,9 +254,9 @@ class ArchaeologicalSite(BaseHistorizedItem, OwnPerms, ValueGetter,
_(u"Sinking date"), null=True, blank=True)
discovery_area = models.TextField(
_(u"Discovery area"), null=True, blank=True)
- affmar_number = models.CharField(_(u"Numéro AffMar"), max_length=100,
+ affmar_number = models.CharField(_(u"AffMar number"), max_length=100,
null=True, blank=True)
- drassm_number = models.CharField(_(u"Numéro DRASSM"), max_length=100,
+ drassm_number = models.CharField(_(u"DRASSM number"), max_length=100,
null=True, blank=True)
# gis
@@ -867,7 +867,7 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
_(u"Finds received"), blank=True, null=True)
# underwater
- drassm_code = models.CharField(_(u"Code DRASSM"), max_length=100,
+ drassm_code = models.CharField(_(u"DRASSM code"), max_length=100,
null=True, blank=True)
# judiciary
seizure_name = models.TextField(_(u"Seizure name"), blank=True, null=True)
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-17 09:30:43 +0000