From 97582674f8d68cf0c3fb7321f1cfff437eb4ea1b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 27 Jul 2017 11:57:33 +0200 Subject: Fix ParcelField compress method --- archaeological_operations/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 058e637f4..3c974991f 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -61,7 +61,7 @@ class ParcelField(forms.MultiValueField): self.widget = ParcelWidget() return super(ParcelField, self).__init__(*args, **kwargs) - def compress(data_list): + def compress(self, data_list): return u"-".join(data_list) -- cgit v1.2.3 From ee5a59601cbd02d43d9c95a51b435688ee298735 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 27 Jul 2017 12:12:30 +0200 Subject: Year limit is now 1000 --- archaeological_files/forms.py | 2 +- archaeological_files_pdl/forms.py | 4 ++-- archaeological_finds/forms_treatments.py | 4 ++-- archaeological_operations/forms.py | 4 ++-- archaeological_operations/utils.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index d8738f511..afb62ae4f 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -209,7 +209,7 @@ class FileFormGeneral(ManageOldType, forms.Form): validators=[valid_id(Person)]) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) numeric_reference = forms.IntegerField( label=_("Numeric reference"), widget=forms.HiddenInput, required=False) diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 73f1d789c..e5fbb4a96 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -40,7 +40,7 @@ class FileFormGeneral(ManageOldType, forms.Form): file_type = forms.ChoiceField(label=_("File type"), choices=[]) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) creation_date = forms.DateField(label=_(u"Creation date"), initial=get_now, widget=widgets.JQueryDate) @@ -413,7 +413,7 @@ class FileFormInstruction(forms.Form): instruction_deadline = forms.DateField(widget=widgets.JQueryDate, required=False) year = forms.IntegerField(label=_("Year"), - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) numeric_reference = forms.IntegerField(label=_("Numeric reference"), required=False) diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 83fb11028..55e223b5d 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -95,7 +95,7 @@ class BaseTreatmentForm(ManageOldType, forms.Form): label=_(u"Other ref."), max_length=200, required=False) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) treatment_type = forms.MultipleChoiceField( label=_(u"Treatment type"), choices=[], @@ -450,7 +450,7 @@ class TreatmentFileForm(ManageOldType, forms.Form): max_length=1000, required=False) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) internal_reference = forms.CharField( label=_(u"Internal ref."), max_length=60, required=False) diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 3c974991f..e3e287d24 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -72,7 +72,7 @@ class ParcelForm(forms.Form): town = forms.ChoiceField(label=_("Town"), choices=(), required=False, validators=[valid_id(models.Town)]) year = forms.IntegerField(label=_("Year"), required=False, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) section = forms.CharField(label=_(u"Section"), required=False, validators=[validators.MaxLengthValidator(4)]) @@ -784,7 +784,7 @@ class OperationFormGeneral(ManageOldType, forms.Form): choices=[]) year = forms.IntegerField(label=_(u"Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) old_code = forms.CharField( label=_(u"Old code"), required=False, diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index 40ca71c05..8afbb3be8 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -256,7 +256,7 @@ def parse_year(value): yr = int(value) except ValueError: return None - if yr < 1600 or yr > 2100: + if yr < 1000 or yr > 2100: return None return yr -- cgit v1.2.3 From b2e1c602627102d2c63616d98305941c773b24fa Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 30 Jul 2017 23:13:28 +0200 Subject: Data importer: allow many split for UnicodeFormater --- archaeological_operations/utils.py | 2 +- ishtar_common/data_importer.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index 8afbb3be8..3a5057cd5 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -268,7 +268,7 @@ def parse_trunc_patriarche(value): value = value.replace(' ', '') try: int(value) - except: + except ValueError: return return '18' + unicode(value) diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 3bb65fc21..2ab5ba28f 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -156,7 +156,7 @@ class ChoiceChecker(object): class UnicodeFormater(Formater): def __init__(self, max_length=None, clean=False, re_filter=None, notnull=False, prefix=u'', db_target=None, - import_instance=None): + import_instance=None, many_split=None): self.max_length = max_length self.db_target = db_target self.clean = clean @@ -164,6 +164,7 @@ class UnicodeFormater(Formater): self.notnull = notnull self.prefix = prefix self.import_instance = import_instance + self.many_split = many_split def format(self, value): try: -- cgit v1.2.3 From 9a9300532592b575a0914e009840c2c4c11f28c0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 31 Jul 2017 11:51:53 +0200 Subject: Context record form/sheet: add opening/closing dates --- archaeological_context_records/forms.py | 4 ++++ archaeological_context_records/models.py | 4 ++-- .../templates/ishtar/sheet_contextrecord.html | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 77b42b609..86a371538 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -156,6 +156,10 @@ class RecordFormGeneral(ManageOldType, forms.Form): label=_(u"Depth of appearance (m)"), required=False) unit = forms.ChoiceField(label=_(u"Context record type"), required=False, choices=[]) + opening_date = forms.DateField(label=_(u"Opening date"), + widget=widgets.JQueryDate, required=False) + closing_date = forms.DateField(label=_(u"Closing date"), + widget=widgets.JQueryDate, required=False) documentation = forms.MultipleChoiceField( label=_("Documentation"), choices=[], required=False, widget=forms.CheckboxSelectMultiple) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index a5f02133e..f5df4e5ec 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -233,9 +233,9 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, label = models.CharField(_(u"ID"), max_length=200) description = models.TextField(_(u"Description"), blank=True, null=True) comment = models.TextField(_(u"General comment"), blank=True, null=True) - opening_date = models.DateField(_(u"Date d'ouverture"), + opening_date = models.DateField(_(u"Opening date"), blank=True, null=True) - closing_date = models.DateField(_(u"End date"), blank=True, null=True) + closing_date = models.DateField(_(u"Closing date"), blank=True, null=True) length = models.FloatField(_(u"Length (m)"), blank=True, null=True) width = models.FloatField(_(u"Width (m)"), blank=True, null=True) thickness = models.FloatField(_(u"Thickness (m)"), blank=True, diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index b10f46325..0a5ea30fc 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -24,6 +24,8 @@ {% field_li_multiple "Chronology" item.datings %} {% field_li "Town" item.parcel.town %} {% field_li_multiple "Documentation" item.documentations %} + {% field_li "Opening date" item.opening_date %} + {% field_li "Closing date" item.closing_date %} {% field "Comment on datings" item.datings_comment "
" "
" %} -- cgit v1.2.3 From aa18b736ba9323e55813377b34b42dcfe77dd35c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 31 Jul 2017 12:03:10 +0200 Subject: Update translation --- archaeological_context_records/locale/django.pot | 260 +++++++-------- archaeological_finds/locale/django.pot | 94 +++--- archaeological_operations/locale/django.pot | 14 +- ishtar_common/locale/django.pot | 384 ++++++++++----------- translations/de/ishtar_common.po | 384 ++++++++++----------- translations/fr/archaeological_context_records.po | 262 +++++++-------- translations/fr/archaeological_finds.po | 94 +++--- translations/fr/archaeological_operations.po | 14 +- translations/fr/ishtar_common.po | 386 +++++++++++----------- 9 files changed, 952 insertions(+), 940 deletions(-) diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 3ca377971..993d8228f 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -8,11 +8,11 @@ msgid "" msgstr "" -#: forms.py:47 forms.py:51 models.py:217 models.py:600 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:231 models.py:620 wizards.py:77 msgid "Operation" msgstr "" -#: forms.py:59 forms.py:142 models.py:219 models.py:568 +#: forms.py:59 forms.py:142 models.py:233 models.py:588 msgid "ID" msgstr "" @@ -36,7 +36,7 @@ msgstr "" msgid "Search within related operations" msgstr "" -#: forms.py:78 forms.py:255 models.py:56 +#: forms.py:78 forms.py:259 models.py:56 msgid "Period" msgstr "" @@ -52,7 +52,7 @@ msgstr "" msgid "Search within relations" msgstr "" -#: forms.py:112 forms.py:359 views.py:92 +#: forms.py:112 forms.py:363 views.py:92 msgid "Context record search" msgstr "" @@ -64,176 +64,184 @@ msgstr "" msgid "General" msgstr "" -#: forms.py:141 models.py:181 models.py:215 models.py:570 +#: forms.py:141 models.py:195 models.py:229 models.py:590 msgid "Parcel" msgstr "" -#: forms.py:144 models.py:220 models.py:571 -#: templates/ishtar/sheet_contextrecord.html:30 +#: forms.py:144 models.py:234 models.py:591 +#: templates/ishtar/sheet_contextrecord.html:33 msgid "Description" msgstr "" -#: forms.py:146 models.py:221 +#: forms.py:146 models.py:235 msgid "General comment" msgstr "" -#: forms.py:149 models.py:268 +#: forms.py:149 models.py:282 msgid "Excavation technique" msgstr "" -#: forms.py:150 models.py:225 +#: forms.py:150 models.py:239 msgid "Length (m)" msgstr "" -#: forms.py:151 models.py:226 +#: forms.py:151 models.py:240 msgid "Width (m)" msgstr "" -#: forms.py:152 models.py:227 +#: forms.py:152 models.py:241 msgid "Thickness (m)" msgstr "" -#: forms.py:153 models.py:229 +#: forms.py:153 models.py:243 msgid "Diameter (m)" msgstr "" -#: forms.py:154 models.py:230 +#: forms.py:154 models.py:244 msgid "Depth (m)" msgstr "" -#: forms.py:156 models.py:232 +#: forms.py:156 models.py:246 msgid "Depth of appearance (m)" msgstr "" -#: forms.py:157 forms.py:379 models.py:242 models.py:569 +#: forms.py:157 forms.py:383 models.py:256 models.py:589 msgid "Context record type" msgstr "" -#: forms.py:160 ishtar_menu.py:48 +#: forms.py:159 models.py:236 +msgid "Opening date" +msgstr "" + +#: forms.py:161 models.py:238 templates/ishtar/sheet_contextrecord.html:87 +msgid "Closing date" +msgstr "" + +#: forms.py:164 ishtar_menu.py:48 msgid "Documentation" msgstr "" -#: forms.py:163 models.py:234 +#: forms.py:167 models.py:248 msgid "Location" msgstr "" -#: forms.py:166 +#: forms.py:170 msgid "Image" msgstr "" -#: forms.py:167 +#: forms.py:171 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:244 +#: forms.py:248 msgid "This ID already exists for this operation." msgstr "" -#: forms.py:250 forms.py:277 models.py:67 +#: forms.py:254 forms.py:281 models.py:67 msgid "Dating" msgstr "" -#: forms.py:256 models.py:57 +#: forms.py:260 models.py:57 msgid "Start date" msgstr "" -#: forms.py:257 models.py:58 models.py:224 +#: forms.py:261 models.py:58 msgid "End date" msgstr "" -#: forms.py:258 models.py:61 +#: forms.py:262 models.py:61 msgid "Quality" msgstr "" -#: forms.py:259 models.py:39 models.py:59 +#: forms.py:263 models.py:39 models.py:59 msgid "Dating type" msgstr "" -#: forms.py:286 ishtar_menu.py:29 models.py:642 +#: forms.py:290 ishtar_menu.py:29 models.py:662 msgid "Context record" msgstr "" -#: forms.py:308 +#: forms.py:312 msgid "Relations" msgstr "" -#: forms.py:312 forms.py:320 models.py:245 -#: templates/ishtar/sheet_contextrecord.html:44 +#: forms.py:316 forms.py:324 models.py:259 +#: templates/ishtar/sheet_contextrecord.html:47 msgid "Interpretation" msgstr "" -#: forms.py:316 +#: forms.py:320 msgid "Comments on dating" msgstr "" -#: forms.py:318 models.py:244 +#: forms.py:322 models.py:258 msgid "Filling" msgstr "" -#: forms.py:322 models.py:265 +#: forms.py:326 models.py:279 msgid "Activity" msgstr "" -#: forms.py:324 models.py:263 +#: forms.py:328 models.py:277 msgid "Identification" msgstr "" -#: forms.py:326 models.py:248 +#: forms.py:330 models.py:262 msgid "TAQ" msgstr "" -#: forms.py:327 models.py:252 +#: forms.py:331 models.py:266 msgid "Estimated TAQ" msgstr "" -#: forms.py:329 models.py:255 +#: forms.py:333 models.py:269 msgid "TPQ" msgstr "" -#: forms.py:330 models.py:259 +#: forms.py:334 models.py:273 msgid "Estimated TPQ" msgstr "" -#: forms.py:345 +#: forms.py:349 msgid "Operation search" msgstr "" -#: forms.py:347 +#: forms.py:351 msgid "You should select an operation." msgstr "" -#: forms.py:352 +#: forms.py:356 msgid "Would you like to delete this context record?" msgstr "" -#: forms.py:361 +#: forms.py:365 msgid "You should select a context record." msgstr "" -#: forms.py:366 +#: forms.py:370 msgid "Year of the operation" msgstr "" -#: forms.py:368 +#: forms.py:372 msgid "Numeric reference" msgstr "" -#: forms.py:375 +#: forms.py:379 msgid "Town of the operation" msgstr "" -#: forms.py:377 +#: forms.py:381 msgid "Period of the context record" msgstr "" -#: forms.py:392 +#: forms.py:396 msgid "Documentation search" msgstr "" -#: forms.py:394 +#: forms.py:398 msgid "You should select a document." msgstr "" @@ -273,244 +281,240 @@ msgstr "" msgid "Datings" msgstr "" -#: models.py:79 models.py:96 models.py:110 +#: models.py:93 models.py:110 models.py:124 msgid "Order" msgstr "" -#: models.py:81 +#: models.py:95 msgid "Parent context record type" msgstr "" -#: models.py:85 +#: models.py:99 msgid "Context record Type" msgstr "" -#: models.py:86 +#: models.py:100 msgid "Context record Types" msgstr "" -#: models.py:99 +#: models.py:113 msgid "Activity Type" msgstr "" -#: models.py:100 +#: models.py:114 msgid "Activity Types" msgstr "" -#: models.py:113 +#: models.py:127 msgid "Identification Type" msgstr "" -#: models.py:114 +#: models.py:128 msgid "Identification Types" msgstr "" -#: models.py:125 +#: models.py:139 msgid "Excavation technique type" msgstr "" -#: models.py:126 +#: models.py:140 msgid "Excavation technique types" msgstr "" -#: models.py:134 +#: models.py:148 msgid "Documentation type" msgstr "" -#: models.py:135 +#: models.py:149 msgid "Documentation types" msgstr "" -#: models.py:172 models.py:572 +#: models.py:186 models.py:592 msgid "Periods" msgstr "" -#: models.py:173 +#: models.py:187 msgid "Datings (period)" msgstr "" -#: models.py:174 +#: models.py:188 msgid "Related context records" msgstr "" -#: models.py:177 +#: models.py:191 msgid "Parcel (external ID)" msgstr "" -#: models.py:178 models.py:179 +#: models.py:192 models.py:193 msgid "Parcel (town)" msgstr "" -#: models.py:180 +#: models.py:194 msgid "Parcel (year)" msgstr "" -#: models.py:212 +#: models.py:226 msgid "External ID" msgstr "" -#: models.py:214 +#: models.py:228 msgid "External ID is set automatically" msgstr "" -#: models.py:222 -msgid "Date d'ouverture" -msgstr "" - -#: models.py:235 +#: models.py:249 msgid "A short description of the location of the context record" msgstr "" -#: models.py:240 +#: models.py:254 msgid "Comment on datings" msgstr "" -#: models.py:249 +#: models.py:263 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: models.py:253 +#: models.py:267 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: models.py:256 +#: models.py:270 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: models.py:260 +#: models.py:274 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: models.py:271 +#: models.py:285 msgid "Point" msgstr "" -#: models.py:272 +#: models.py:286 msgid "Polygon" msgstr "" -#: models.py:273 +#: models.py:287 msgid "Cached name" msgstr "" -#: models.py:277 models.py:278 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:291 models.py:292 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" -#: models.py:280 +#: models.py:294 msgid "Can view all Context Records" msgstr "" -#: models.py:282 +#: models.py:296 msgid "Can view own Context Record" msgstr "" -#: models.py:284 +#: models.py:298 msgid "Can add own Context Record" msgstr "" -#: models.py:286 +#: models.py:300 msgid "Can change own Context Record" msgstr "" -#: models.py:288 +#: models.py:302 msgid "Can delete own Context Record" msgstr "" -#: models.py:298 +#: models.py:312 msgctxt "short" msgid "Context record" msgstr "" -#: models.py:502 +#: models.py:522 msgid "Inverse relation" msgstr "" -#: models.py:506 models.py:529 models.py:567 +#: models.py:526 models.py:549 models.py:587 msgid "Relation type" msgstr "" -#: models.py:507 +#: models.py:527 msgid "Relation types" msgstr "" -#: models.py:524 +#: models.py:544 msgid "ID (left)" msgstr "" -#: models.py:525 +#: models.py:545 msgid "Context record type (left)" msgstr "" -#: models.py:526 +#: models.py:546 msgid "Parcel (left)" msgstr "" -#: models.py:527 +#: models.py:547 msgid "Description (left)" msgstr "" -#: models.py:528 +#: models.py:548 msgid "Periods (left)" msgstr "" -#: models.py:530 +#: models.py:550 msgid "ID (right)" msgstr "" -#: models.py:531 +#: models.py:551 msgid "Context record type (right)" msgstr "" -#: models.py:532 +#: models.py:552 msgid "Parcel (right)" msgstr "" -#: models.py:533 +#: models.py:553 msgid "Description (right)" msgstr "" -#: models.py:534 +#: models.py:554 msgid "Periods (right)" msgstr "" -#: models.py:543 +#: models.py:563 msgid "Record relation" msgstr "" -#: models.py:544 +#: models.py:564 msgid "Record relations" msgstr "" -#: models.py:627 +#: models.py:647 msgid "Context record documentation" msgstr "" -#: models.py:628 +#: models.py:648 msgid "Context record documentations" msgstr "" -#: models.py:631 +#: models.py:651 msgid "Can view all Context record sources" msgstr "" -#: models.py:633 +#: models.py:653 msgid "Can view own Context record source" msgstr "" -#: models.py:635 +#: models.py:655 msgid "Can add own Context record source" msgstr "" -#: models.py:637 +#: models.py:657 msgid "Can change own Context record source" msgstr "" -#: models.py:639 +#: models.py:659 msgid "Can delete own Context record source" msgstr "" @@ -550,71 +554,67 @@ msgstr "" msgid "Temporary ID" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:56 +#: templates/ishtar/sheet_contextrecord.html:59 msgid "Datations" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:65 +#: templates/ishtar/sheet_contextrecord.html:68 msgid "Context record relations" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:72 +#: templates/ishtar/sheet_contextrecord.html:75 msgid "Operation summary" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:74 +#: templates/ishtar/sheet_contextrecord.html:77 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:78 +#: templates/ishtar/sheet_contextrecord.html:81 msgid "Numerical reference" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:85 msgid "State" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:85 msgid "Active file" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:85 msgid "Closed operation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:84 -msgid "Closing date" -msgstr "" - -#: templates/ishtar/sheet_contextrecord.html:84 +#: templates/ishtar/sheet_contextrecord.html:87 msgid "by" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:92 +#: templates/ishtar/sheet_contextrecord.html:95 msgid "Localisation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:93 +#: templates/ishtar/sheet_contextrecord.html:96 msgid "Towns" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:94 +#: templates/ishtar/sheet_contextrecord.html:97 msgid "Related operation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:96 +#: templates/ishtar/sheet_contextrecord.html:99 msgid "No operation linked to this context unit!" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:99 +#: templates/ishtar/sheet_contextrecord.html:102 msgid "Document from this context record" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:104 +#: templates/ishtar/sheet_contextrecord.html:107 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:109 +#: templates/ishtar/sheet_contextrecord.html:112 msgid "Documents from associated finds" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 121d3d48a..1a09f38df 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -13,8 +13,8 @@ msgstr "" msgid "Context record" msgstr "" -#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1160 -#: models_finds.py:1181 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1166 +#: models_finds.py:1187 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" @@ -195,13 +195,13 @@ msgid "Period" msgstr "" #: forms.py:316 forms_treatments.py:138 forms_treatments.py:283 -#: forms_treatments.py:481 models_finds.py:1186 models_treatments.py:130 +#: forms_treatments.py:481 models_finds.py:1192 models_treatments.py:130 #: models_treatments.py:309 templates/ishtar/sheet_find.html:94 #: templates/ishtar/sheet_find.html:136 msgid "Start date" msgstr "" -#: forms.py:318 models_finds.py:1187 models_treatments.py:310 +#: forms.py:318 models_finds.py:1193 models_treatments.py:310 #: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137 msgid "End date" msgstr "" @@ -378,7 +378,7 @@ msgstr "" msgid "Treatment type" msgstr "" -#: forms_treatments.py:68 forms_treatments.py:650 views.py:398 +#: forms_treatments.py:68 forms_treatments.py:650 views.py:401 msgid "Treatment search" msgstr "" @@ -472,7 +472,7 @@ msgstr "" #: forms_treatments.py:267 forms_treatments.py:442 ishtar_menu.py:108 #: models_treatments.py:516 models_treatments.py:544 models_treatments.py:619 -#: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 +#: wizards.py:188 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "" @@ -579,7 +579,7 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: forms_treatments.py:430 forms_treatments.py:655 views.py:502 +#: forms_treatments.py:430 forms_treatments.py:655 views.py:505 msgid "Treatment request search" msgstr "" @@ -662,7 +662,7 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1183 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1189 msgid "Administrative act" msgstr "" @@ -945,43 +945,43 @@ msgstr "" msgid "FIND" msgstr "" -#: models_finds.py:1146 +#: models_finds.py:1152 msgid "Find documentation" msgstr "" -#: models_finds.py:1147 +#: models_finds.py:1153 msgid "Find documentations" msgstr "" -#: models_finds.py:1150 +#: models_finds.py:1156 msgid "Can view all Find sources" msgstr "" -#: models_finds.py:1152 +#: models_finds.py:1158 msgid "Can view own Find source" msgstr "" -#: models_finds.py:1154 +#: models_finds.py:1160 msgid "Can add own Find source" msgstr "" -#: models_finds.py:1156 +#: models_finds.py:1162 msgid "Can change own Find source" msgstr "" -#: models_finds.py:1158 +#: models_finds.py:1164 msgid "Can delete own Find source" msgstr "" -#: models_finds.py:1184 +#: models_finds.py:1190 msgid "Person" msgstr "" -#: models_finds.py:1190 +#: models_finds.py:1196 msgid "Property" msgstr "" -#: models_finds.py:1191 +#: models_finds.py:1197 msgid "Properties" msgstr "" @@ -1207,119 +1207,119 @@ msgstr "" msgid "Find modification" msgstr "" -#: views.py:189 +#: views.py:192 msgid "Find deletion" msgstr "" -#: views.py:194 +#: views.py:197 msgid "Find: source search" msgstr "" -#: views.py:202 +#: views.py:205 msgid "Find: new source" msgstr "" -#: views.py:210 +#: views.py:213 msgid "Find: source modification" msgstr "" -#: views.py:225 +#: views.py:228 msgid "Find: source deletion" msgstr "" -#: views.py:239 +#: views.py:242 msgid "New basket" msgstr "" -#: views.py:258 +#: views.py:261 msgid "Manage items in basket" msgstr "" -#: views.py:278 +#: views.py:281 msgid "Manage basket" msgstr "" -#: views.py:369 +#: views.py:372 msgid "Delete basket" msgstr "" -#: views.py:419 +#: views.py:422 msgid "New treatment" msgstr "" -#: views.py:427 views.py:519 +#: views.py:430 views.py:522 msgid "Modify" msgstr "" -#: views.py:444 +#: views.py:447 msgid "Treatment deletion" msgstr "" -#: views.py:451 +#: views.py:454 msgid "Treatment: search administrative act" msgstr "" -#: views.py:460 +#: views.py:463 msgid "Treatment: new administrative act" msgstr "" -#: views.py:470 +#: views.py:473 msgid "Treatment: administrative act modification" msgstr "" -#: views.py:479 +#: views.py:482 msgid "Treatment: administrative act deletion" msgstr "" -#: views.py:512 +#: views.py:515 msgid "New treatment request" msgstr "" -#: views.py:535 +#: views.py:538 msgid "Treatment request deletion" msgstr "" -#: views.py:542 +#: views.py:545 msgid "Treatment request: search administrative act" msgstr "" -#: views.py:552 +#: views.py:555 msgid "Treatment request: new administrative act" msgstr "" -#: views.py:562 +#: views.py:565 msgid "Treatment request: administrative act modification" msgstr "" -#: views.py:571 +#: views.py:574 msgid "Treatment request: administrative act deletion" msgstr "" -#: views.py:597 +#: views.py:600 msgid "Treatment: source search" msgstr "" -#: views.py:612 +#: views.py:615 msgid "Treatment: source modification" msgstr "" -#: views.py:627 +#: views.py:630 msgid "Treatment: source deletion" msgstr "" -#: views.py:640 +#: views.py:643 msgid "Treatment request: source search" msgstr "" -#: views.py:656 +#: views.py:659 msgid "Treatment request: source modification" msgstr "" -#: views.py:674 +#: views.py:677 msgid "Treatment request: source deletion" msgstr "" -#: wizards.py:63 wizards.py:199 +#: wizards.py:63 wizards.py:200 msgid "Operation" msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 60d14f5a4..8373fb24c 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -535,7 +535,7 @@ msgstr "" msgid "Object" msgstr "" -#: forms.py:1359 views.py:350 +#: forms.py:1359 views.py:354 msgid "Administrative act search" msgstr "" @@ -578,7 +578,7 @@ msgstr "" msgid "Generate the associated doc?" msgstr "" -#: forms.py:1523 ishtar_menu.py:123 views.py:403 +#: forms.py:1523 ishtar_menu.py:123 views.py:407 msgctxt "admin act register" msgid "Register" msgstr "" @@ -1083,23 +1083,23 @@ msgstr "" msgid "Operation: source creation" msgstr "" -#: views.py:329 +#: views.py:333 msgid "Operation: source modification" msgstr "" -#: views.py:344 +#: views.py:348 msgid "Operation: source deletion" msgstr "" -#: views.py:363 +#: views.py:367 msgid "Operation: new administrative act" msgstr "" -#: views.py:373 +#: views.py:377 msgid "Operation: administrative act modification" msgstr "" -#: views.py:397 +#: views.py:401 msgid "Operation: administrative act deletion" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 4a7e66801..c43a1e9ae 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -26,125 +26,125 @@ msgstr "" msgid "Export selected as CSV file" msgstr "" -#: data_importer.py:192 +#: data_importer.py:193 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: data_importer.py:209 +#: data_importer.py:210 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: data_importer.py:221 +#: data_importer.py:222 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: data_importer.py:234 data_importer.py:248 data_importer.py:502 +#: data_importer.py:235 data_importer.py:249 data_importer.py:503 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: data_importer.py:261 +#: data_importer.py:262 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: data_importer.py:318 data_importer.py:567 +#: data_importer.py:319 data_importer.py:568 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: data_importer.py:325 +#: data_importer.py:326 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: data_importer.py:328 +#: data_importer.py:329 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: data_importer.py:528 +#: data_importer.py:529 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: data_importer.py:644 +#: data_importer.py:645 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: data_importer.py:648 +#: data_importer.py:649 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: data_importer.py:650 +#: data_importer.py:651 msgid "No data provided" msgstr "" -#: data_importer.py:651 +#: data_importer.py:652 msgid "Value is required" msgstr "" -#: data_importer.py:652 +#: data_importer.py:653 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: data_importer.py:653 +#: data_importer.py:654 msgid "The regexp doesn't match." msgstr "" -#: data_importer.py:655 +#: data_importer.py:656 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: data_importer.py:657 +#: data_importer.py:658 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: data_importer.py:1110 +#: data_importer.py:1111 msgid "Not imported" msgstr "" -#: data_importer.py:1247 +#: data_importer.py:1248 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "line" msgstr "" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "col" msgstr "" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "error" msgstr "" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "field" msgstr "" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "source" msgstr "" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "result" msgstr "" -#: data_importer.py:1596 +#: data_importer.py:1599 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -182,7 +182,7 @@ msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1624 models.py:3087 +#: forms_common.py:408 models.py:1624 models.py:3089 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -198,8 +198,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.

" msgstr "" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2687 -#: models.py:2880 models.py:2942 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2689 +#: models.py:2882 models.py:2944 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -210,15 +210,15 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2570 models.py:2661 +#: ishtar_menu.py:75 models.py:2572 models.py:2663 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 #: forms_common.py:378 forms_common.py:448 models.py:1161 models.py:1557 -#: models.py:1826 models.py:1842 models.py:2080 models.py:2358 models.py:2564 -#: models.py:2673 models.py:3073 models.py:3170 +#: models.py:1826 models.py:1842 models.py:2080 models.py:2360 models.py:2566 +#: models.py:2675 models.py:3075 models.py:3172 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 @@ -267,8 +267,8 @@ msgstr "" msgid "Mobile phone" msgstr "" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2249 -#: models.py:2566 models.py:3008 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2251 +#: models.py:2568 models.py:3010 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -292,7 +292,7 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2671 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2673 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" @@ -311,16 +311,16 @@ msgid "Identity" msgstr "" #: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2212 -#: models.py:2665 models.py:2667 models.py:3005 templates/sheet_ope.html:104 +#: models.py:2667 models.py:2669 models.py:3007 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2669 +#: forms_common.py:374 models.py:2671 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2675 +#: forms_common.py:380 models.py:2677 msgid "Raw name" msgstr "" @@ -380,7 +380,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2618 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2620 msgid "Person type" msgstr "" @@ -388,7 +388,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:577 wizards.py:1347 +#: forms_common.py:577 wizards.py:1352 msgid "New password" msgstr "" @@ -412,7 +412,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:3088 +#: forms_common.py:636 forms_common.py:649 models.py:3090 msgid "Towns" msgstr "" @@ -428,7 +428,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2980 +#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2982 msgid "Source type" msgstr "" @@ -440,37 +440,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:3019 +#: forms_common.py:791 models.py:3021 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:3021 +#: forms_common.py:792 models.py:3023 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2384 models.py:3023 +#: forms_common.py:794 models.py:2386 models.py:3025 msgid "Creation date" msgstr "" -#: forms_common.py:797 models.py:3026 +#: forms_common.py:797 models.py:3028 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:799 forms_common.py:835 models.py:421 models.py:748 -#: models.py:2107 models.py:2679 models.py:3033 +#: models.py:2107 models.py:2681 models.py:3035 msgid "Comment" msgstr "" #: forms_common.py:801 forms_common.py:834 models.py:1163 models.py:1846 -#: models.py:2034 models.py:2081 models.py:3032 templates/sheet_ope.html:128 +#: models.py:2034 models.py:2081 models.py:3034 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:804 models.py:3034 +#: forms_common.py:804 models.py:3036 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:3036 +#: forms_common.py:806 forms_common.py:838 models.py:3038 msgid "Has a duplicate" msgstr "" @@ -485,7 +485,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2947 +#: forms_common.py:827 forms_common.py:856 forms_common.py:891 models.py:2949 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -498,7 +498,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2214 models.py:2934 models.py:2944 +#: forms_common.py:864 models.py:2214 models.py:2936 models.py:2946 msgid "Author type" msgstr "" @@ -506,11 +506,11 @@ msgstr "" msgid "Author selection" msgstr "" -#: forms_common.py:897 +#: forms_common.py:898 msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2948 models.py:3015 +#: forms_common.py:902 models.py:2950 models.py:3017 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -528,7 +528,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1340 views.py:1648 +#: ishtar_menu.py:39 models.py:1340 views.py:1649 msgid "Global variables" msgstr "" @@ -556,19 +556,19 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2392 +#: ishtar_menu.py:109 models.py:2394 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1656 +#: ishtar_menu.py:112 views.py:1657 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1670 +#: ishtar_menu.py:116 views.py:1671 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1709 +#: ishtar_menu.py:120 views.py:1710 msgid "Old imports" msgstr "" @@ -612,7 +612,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:1021 models.py:2931 models.py:3099 models.py:3155 +#: models.py:1021 models.py:2933 models.py:3101 models.py:3157 msgid "Order" msgstr "" @@ -869,7 +869,7 @@ msgstr "" msgid "Document templates" msgstr "" -#: models.py:1596 models.py:1606 models.py:2378 models.py:3193 +#: models.py:1596 models.py:1606 models.py:2380 models.py:3195 msgid "State" msgstr "" @@ -1059,11 +1059,11 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: models.py:2215 models.py:3011 +#: models.py:2215 models.py:3013 msgid "Format" msgstr "" -#: models.py:2216 models.py:3103 +#: models.py:2216 models.py:3105 msgid "Operation type" msgstr "" @@ -1087,486 +1087,490 @@ msgstr "" msgid "Activity type" msgstr "" -#: models.py:2223 -msgid "Material" +#: models.py:2224 +msgid "Documentation type" msgstr "" #: models.py:2225 +msgid "Material" +msgstr "" + +#: models.py:2227 msgid "Conservatory state" msgstr "" -#: models.py:2226 +#: models.py:2228 msgid "Container type" msgstr "" -#: models.py:2227 +#: models.py:2229 msgid "Preservation type" msgstr "" -#: models.py:2228 +#: models.py:2230 msgid "Object type" msgstr "" -#: models.py:2229 +#: models.py:2231 msgid "Integrity type" msgstr "" -#: models.py:2231 +#: models.py:2233 msgid "Remarkability type" msgstr "" -#: models.py:2232 +#: models.py:2234 msgid "Batch type" msgstr "" -#: models.py:2234 +#: models.py:2236 msgid "Identification type" msgstr "" -#: models.py:2236 +#: models.py:2238 msgid "Context record relation type" msgstr "" -#: models.py:2237 models.py:3161 +#: models.py:2239 models.py:3163 msgid "Spatial reference system" msgstr "" -#: models.py:2238 models.py:2989 +#: models.py:2240 models.py:2991 msgid "Support type" msgstr "" -#: models.py:2239 models.py:2630 +#: models.py:2241 models.py:2632 msgid "Title type" msgstr "" -#: models.py:2245 +#: models.py:2247 msgid "Integer" msgstr "" -#: models.py:2246 +#: models.py:2248 msgid "Float" msgstr "" -#: models.py:2247 +#: models.py:2249 msgid "String" msgstr "" -#: models.py:2248 templates/sheet_ope.html:86 +#: models.py:2250 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2250 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2252 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2251 +#: models.py:2253 msgid "String to boolean" msgstr "" -#: models.py:2252 +#: models.py:2254 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2253 +#: models.py:2255 msgid "Unknow type" msgstr "" -#: models.py:2269 +#: models.py:2271 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2270 +#: models.py:2272 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2271 +#: models.py:2273 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2281 +#: models.py:2283 msgid "Options" msgstr "" -#: models.py:2283 +#: models.py:2285 msgid "Split character(s)" msgstr "" -#: models.py:2287 +#: models.py:2289 msgid "Importer - Formater type" msgstr "" -#: models.py:2288 +#: models.py:2290 msgid "Importer - Formater types" msgstr "" -#: models.py:2340 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2342 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2341 +#: models.py:2343 msgid "Analyse in progress" msgstr "" -#: models.py:2342 +#: models.py:2344 msgid "Analysed" msgstr "" -#: models.py:2343 +#: models.py:2345 msgid "Import pending" msgstr "" -#: models.py:2344 +#: models.py:2346 msgid "Import in progress" msgstr "" -#: models.py:2345 models.py:3184 +#: models.py:2347 models.py:3186 msgid "Finished with errors" msgstr "" -#: models.py:2346 models.py:3185 +#: models.py:2348 models.py:3187 msgid "Finished" msgstr "" -#: models.py:2347 +#: models.py:2349 msgid "Archived" msgstr "" -#: models.py:2362 +#: models.py:2364 msgid "Imported file" msgstr "" -#: models.py:2364 +#: models.py:2366 msgid "Associated images (zip file)" msgstr "" -#: models.py:2366 +#: models.py:2368 msgid "Encoding" msgstr "" -#: models.py:2368 +#: models.py:2370 msgid "Skip lines" msgstr "" -#: models.py:2369 templates/ishtar/import_list.html:51 +#: models.py:2371 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2372 +#: models.py:2374 msgid "Result file" msgstr "" -#: models.py:2375 templates/ishtar/import_list.html:57 +#: models.py:2377 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2381 +#: models.py:2383 msgid "Conservative import" msgstr "" -#: models.py:2385 +#: models.py:2387 msgid "End date" msgstr "" -#: models.py:2388 +#: models.py:2390 msgid "Remaining seconds" msgstr "" -#: models.py:2391 +#: models.py:2393 msgid "Import" msgstr "" -#: models.py:2420 +#: models.py:2422 msgid "Analyse" msgstr "" -#: models.py:2422 models.py:2425 +#: models.py:2424 models.py:2427 msgid "Re-analyse" msgstr "" -#: models.py:2423 +#: models.py:2425 msgid "Launch import" msgstr "" -#: models.py:2426 +#: models.py:2428 msgid "Re-import" msgstr "" -#: models.py:2427 +#: models.py:2429 msgid "Archive" msgstr "" -#: models.py:2429 +#: models.py:2431 msgid "Unarchive" msgstr "" -#: models.py:2430 widgets.py:198 templates/ishtar/form_delete.html:11 +#: models.py:2432 widgets.py:198 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2571 +#: models.py:2573 msgid "Organizations" msgstr "" -#: models.py:2573 +#: models.py:2575 msgid "Can view all Organizations" msgstr "" -#: models.py:2574 +#: models.py:2576 msgid "Can view own Organization" msgstr "" -#: models.py:2575 +#: models.py:2577 msgid "Can add own Organization" msgstr "" -#: models.py:2577 +#: models.py:2579 msgid "Can change own Organization" msgstr "" -#: models.py:2579 +#: models.py:2581 msgid "Can delete own Organization" msgstr "" -#: models.py:2614 +#: models.py:2616 msgid "Groups" msgstr "" -#: models.py:2619 +#: models.py:2621 msgid "Person types" msgstr "" -#: models.py:2631 +#: models.py:2633 msgid "Title types" msgstr "" -#: models.py:2640 +#: models.py:2642 msgid "Mr" msgstr "" -#: models.py:2641 +#: models.py:2643 msgid "Miss" msgstr "" -#: models.py:2642 +#: models.py:2644 msgid "Mr and Mrs" msgstr "" -#: models.py:2643 +#: models.py:2645 msgid "Mrs" msgstr "" -#: models.py:2644 +#: models.py:2646 msgid "Doctor" msgstr "" -#: models.py:2677 +#: models.py:2679 msgid "Contact type" msgstr "" -#: models.py:2680 models.py:2744 +#: models.py:2682 models.py:2746 msgid "Types" msgstr "" -#: models.py:2683 +#: models.py:2685 msgid "Is attached to" msgstr "" -#: models.py:2688 +#: models.py:2690 msgid "Persons" msgstr "" -#: models.py:2690 +#: models.py:2692 msgid "Can view all Persons" msgstr "" -#: models.py:2691 +#: models.py:2693 msgid "Can view own Person" msgstr "" -#: models.py:2692 +#: models.py:2694 msgid "Can add own Person" msgstr "" -#: models.py:2693 +#: models.py:2695 msgid "Can change own Person" msgstr "" -#: models.py:2694 +#: models.py:2696 msgid "Can delete own Person" msgstr "" -#: models.py:2883 +#: models.py:2885 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2886 +#: models.py:2888 msgid "Ishtar user" msgstr "" -#: models.py:2887 +#: models.py:2889 msgid "Ishtar users" msgstr "" -#: models.py:2927 +#: models.py:2929 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2935 +#: models.py:2937 msgid "Author types" msgstr "" -#: models.py:2952 +#: models.py:2954 msgid "Can view all Authors" msgstr "" -#: models.py:2954 +#: models.py:2956 msgid "Can view own Author" msgstr "" -#: models.py:2956 +#: models.py:2958 msgid "Can add own Author" msgstr "" -#: models.py:2958 +#: models.py:2960 msgid "Can change own Author" msgstr "" -#: models.py:2960 +#: models.py:2962 msgid "Can delete own Author" msgstr "" -#: models.py:2981 +#: models.py:2983 msgid "Source types" msgstr "" -#: models.py:2990 +#: models.py:2992 msgid "Support types" msgstr "" -#: models.py:2997 +#: models.py:2999 msgid "Format type" msgstr "" -#: models.py:2998 +#: models.py:3000 msgid "Format types" msgstr "" -#: models.py:3006 +#: models.py:3008 msgid "External ID" msgstr "" -#: models.py:3009 +#: models.py:3011 msgid "Support" msgstr "" -#: models.py:3013 +#: models.py:3015 msgid "Scale" msgstr "" -#: models.py:3027 +#: models.py:3029 msgid "Item number" msgstr "" -#: models.py:3028 +#: models.py:3030 msgid "Ref." msgstr "" -#: models.py:3031 +#: models.py:3033 msgid "Internal ref." msgstr "" -#: models.py:3074 +#: models.py:3076 msgid "Surface (m2)" msgstr "" -#: models.py:3075 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3077 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:3100 +#: models.py:3102 msgid "Is preventive" msgstr "" -#: models.py:3104 +#: models.py:3106 msgid "Operation types" msgstr "" -#: models.py:3133 +#: models.py:3135 msgid "Preventive" msgstr "" -#: models.py:3134 +#: models.py:3136 msgid "Research" msgstr "" -#: models.py:3157 +#: models.py:3159 msgid "Authority name" msgstr "" -#: models.py:3158 +#: models.py:3160 msgid "Authority SRID" msgstr "" -#: models.py:3162 +#: models.py:3164 msgid "Spatial reference systems" msgstr "" -#: models.py:3169 +#: models.py:3171 msgid "Filename" msgstr "" -#: models.py:3174 +#: models.py:3176 msgid "Administration script" msgstr "" -#: models.py:3175 +#: models.py:3177 msgid "Administration scripts" msgstr "" -#: models.py:3182 +#: models.py:3184 msgid "Scheduled" msgstr "" -#: models.py:3183 +#: models.py:3185 msgid "In progress" msgstr "" -#: models.py:3198 +#: models.py:3200 msgid "Result" msgstr "" -#: models.py:3201 +#: models.py:3203 msgid "Administration task" msgstr "" -#: models.py:3202 +#: models.py:3204 msgid "Administration tasks" msgstr "" -#: models.py:3206 +#: models.py:3208 msgid "Unknown" msgstr "" -#: models.py:3221 +#: models.py:3223 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: models.py:3230 +#: models.py:3232 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: models.py:3241 +#: models.py:3243 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: models.py:3257 +#: models.py:3259 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." @@ -1673,31 +1677,31 @@ msgstr "" msgid "Treatments" msgstr "" -#: views.py:1723 templates/ishtar/import_list.html:47 +#: views.py:1724 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "" -#: views.py:1738 +#: views.py:1739 msgid "Delete import" msgstr "" -#: views.py:1777 +#: views.py:1778 msgid "Merge persons" msgstr "" -#: views.py:1801 +#: views.py:1802 msgid "Select the main person" msgstr "" -#: views.py:1810 +#: views.py:1811 msgid "Merge organization" msgstr "" -#: views.py:1820 +#: views.py:1821 msgid "Select the main organization" msgstr "" -#: views.py:1860 views.py:1876 +#: views.py:1861 views.py:1877 msgid "Corporation manager" msgstr "" @@ -1725,7 +1729,7 @@ msgstr "" msgid "No" msgstr "" -#: wizards.py:1404 +#: wizards.py:1409 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index b925c52da..16cb1bbb3 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -28,125 +28,125 @@ msgstr "" msgid "Export selected as CSV file" msgstr "" -#: data_importer.py:192 +#: data_importer.py:193 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: data_importer.py:209 +#: data_importer.py:210 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: data_importer.py:221 +#: data_importer.py:222 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: data_importer.py:234 data_importer.py:248 data_importer.py:502 +#: data_importer.py:235 data_importer.py:249 data_importer.py:503 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: data_importer.py:261 +#: data_importer.py:262 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: data_importer.py:318 data_importer.py:567 +#: data_importer.py:319 data_importer.py:568 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: data_importer.py:325 +#: data_importer.py:326 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: data_importer.py:328 +#: data_importer.py:329 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: data_importer.py:528 +#: data_importer.py:529 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: data_importer.py:644 +#: data_importer.py:645 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: data_importer.py:648 +#: data_importer.py:649 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: data_importer.py:650 +#: data_importer.py:651 msgid "No data provided" msgstr "" -#: data_importer.py:651 +#: data_importer.py:652 msgid "Value is required" msgstr "" -#: data_importer.py:652 +#: data_importer.py:653 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: data_importer.py:653 +#: data_importer.py:654 msgid "The regexp doesn't match." msgstr "" -#: data_importer.py:655 +#: data_importer.py:656 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: data_importer.py:657 +#: data_importer.py:658 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: data_importer.py:1110 +#: data_importer.py:1111 msgid "Not imported" msgstr "" -#: data_importer.py:1247 +#: data_importer.py:1248 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "line" msgstr "" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "col" msgstr "" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "error" msgstr "" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "field" msgstr "" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "source" msgstr "" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "result" msgstr "" -#: data_importer.py:1596 +#: data_importer.py:1599 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -184,7 +184,7 @@ msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1624 models.py:3087 +#: forms_common.py:408 models.py:1624 models.py:3089 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -200,8 +200,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.

" msgstr "" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2687 -#: models.py:2880 models.py:2942 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2689 +#: models.py:2882 models.py:2944 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -212,15 +212,15 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2570 models.py:2661 +#: ishtar_menu.py:75 models.py:2572 models.py:2663 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 #: forms_common.py:378 forms_common.py:448 models.py:1161 models.py:1557 -#: models.py:1826 models.py:1842 models.py:2080 models.py:2358 models.py:2564 -#: models.py:2673 models.py:3073 models.py:3170 +#: models.py:1826 models.py:1842 models.py:2080 models.py:2360 models.py:2566 +#: models.py:2675 models.py:3075 models.py:3172 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 @@ -269,8 +269,8 @@ msgstr "" msgid "Mobile phone" msgstr "" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2249 -#: models.py:2566 models.py:3008 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2251 +#: models.py:2568 models.py:3010 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -294,7 +294,7 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2671 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2673 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" @@ -313,16 +313,16 @@ msgid "Identity" msgstr "" #: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2212 -#: models.py:2665 models.py:2667 models.py:3005 templates/sheet_ope.html:104 +#: models.py:2667 models.py:2669 models.py:3007 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2669 +#: forms_common.py:374 models.py:2671 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2675 +#: forms_common.py:380 models.py:2677 msgid "Raw name" msgstr "" @@ -382,7 +382,7 @@ msgstr "Benutzername" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2618 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2620 msgid "Person type" msgstr "" @@ -390,7 +390,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:577 wizards.py:1347 +#: forms_common.py:577 wizards.py:1352 msgid "New password" msgstr "" @@ -414,7 +414,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:3088 +#: forms_common.py:636 forms_common.py:649 models.py:3090 msgid "Towns" msgstr "" @@ -430,7 +430,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2980 +#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2982 msgid "Source type" msgstr "" @@ -442,37 +442,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:3019 +#: forms_common.py:791 models.py:3021 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:3021 +#: forms_common.py:792 models.py:3023 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2384 models.py:3023 +#: forms_common.py:794 models.py:2386 models.py:3025 msgid "Creation date" msgstr "Gründungsdatum" -#: forms_common.py:797 models.py:3026 +#: forms_common.py:797 models.py:3028 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:799 forms_common.py:835 models.py:421 models.py:748 -#: models.py:2107 models.py:2679 models.py:3033 +#: models.py:2107 models.py:2681 models.py:3035 msgid "Comment" msgstr "" #: forms_common.py:801 forms_common.py:834 models.py:1163 models.py:1846 -#: models.py:2034 models.py:2081 models.py:3032 templates/sheet_ope.html:128 +#: models.py:2034 models.py:2081 models.py:3034 templates/sheet_ope.html:128 msgid "Description" msgstr "Beschreibung" -#: forms_common.py:804 models.py:3034 +#: forms_common.py:804 models.py:3036 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:3036 +#: forms_common.py:806 forms_common.py:838 models.py:3038 msgid "Has a duplicate" msgstr "" @@ -487,7 +487,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2947 +#: forms_common.py:827 forms_common.py:856 forms_common.py:891 models.py:2949 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -500,7 +500,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2214 models.py:2934 models.py:2944 +#: forms_common.py:864 models.py:2214 models.py:2936 models.py:2946 msgid "Author type" msgstr "" @@ -508,11 +508,11 @@ msgstr "" msgid "Author selection" msgstr "" -#: forms_common.py:897 +#: forms_common.py:898 msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2948 models.py:3015 +#: forms_common.py:902 models.py:2950 models.py:3017 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -530,7 +530,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1340 views.py:1648 +#: ishtar_menu.py:39 models.py:1340 views.py:1649 msgid "Global variables" msgstr "" @@ -558,19 +558,19 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2392 +#: ishtar_menu.py:109 models.py:2394 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1656 +#: ishtar_menu.py:112 views.py:1657 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1670 +#: ishtar_menu.py:116 views.py:1671 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1709 +#: ishtar_menu.py:120 views.py:1710 msgid "Old imports" msgstr "" @@ -614,7 +614,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:1021 models.py:2931 models.py:3099 models.py:3155 +#: models.py:1021 models.py:2933 models.py:3101 models.py:3157 msgid "Order" msgstr "" @@ -871,7 +871,7 @@ msgstr "" msgid "Document templates" msgstr "" -#: models.py:1596 models.py:1606 models.py:2378 models.py:3193 +#: models.py:1596 models.py:1606 models.py:2380 models.py:3195 msgid "State" msgstr "" @@ -1061,11 +1061,11 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: models.py:2215 models.py:3011 +#: models.py:2215 models.py:3013 msgid "Format" msgstr "" -#: models.py:2216 models.py:3103 +#: models.py:2216 models.py:3105 msgid "Operation type" msgstr "" @@ -1089,486 +1089,490 @@ msgstr "" msgid "Activity type" msgstr "" -#: models.py:2223 -msgid "Material" +#: models.py:2224 +msgid "Documentation type" msgstr "" #: models.py:2225 +msgid "Material" +msgstr "" + +#: models.py:2227 msgid "Conservatory state" msgstr "" -#: models.py:2226 +#: models.py:2228 msgid "Container type" msgstr "" -#: models.py:2227 +#: models.py:2229 msgid "Preservation type" msgstr "" -#: models.py:2228 +#: models.py:2230 msgid "Object type" msgstr "" -#: models.py:2229 +#: models.py:2231 msgid "Integrity type" msgstr "" -#: models.py:2231 +#: models.py:2233 msgid "Remarkability type" msgstr "" -#: models.py:2232 +#: models.py:2234 msgid "Batch type" msgstr "" -#: models.py:2234 +#: models.py:2236 msgid "Identification type" msgstr "" -#: models.py:2236 +#: models.py:2238 msgid "Context record relation type" msgstr "" -#: models.py:2237 models.py:3161 +#: models.py:2239 models.py:3163 msgid "Spatial reference system" msgstr "" -#: models.py:2238 models.py:2989 +#: models.py:2240 models.py:2991 msgid "Support type" msgstr "" -#: models.py:2239 models.py:2630 +#: models.py:2241 models.py:2632 msgid "Title type" msgstr "" -#: models.py:2245 +#: models.py:2247 msgid "Integer" msgstr "" -#: models.py:2246 +#: models.py:2248 msgid "Float" msgstr "" -#: models.py:2247 +#: models.py:2249 msgid "String" msgstr "" -#: models.py:2248 templates/sheet_ope.html:86 +#: models.py:2250 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2250 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2252 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2251 +#: models.py:2253 msgid "String to boolean" msgstr "" -#: models.py:2252 +#: models.py:2254 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2253 +#: models.py:2255 msgid "Unknow type" msgstr "" -#: models.py:2269 +#: models.py:2271 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2270 +#: models.py:2272 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2271 +#: models.py:2273 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2281 +#: models.py:2283 msgid "Options" msgstr "" -#: models.py:2283 +#: models.py:2285 msgid "Split character(s)" msgstr "" -#: models.py:2287 +#: models.py:2289 msgid "Importer - Formater type" msgstr "" -#: models.py:2288 +#: models.py:2290 msgid "Importer - Formater types" msgstr "" -#: models.py:2340 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2342 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2341 +#: models.py:2343 msgid "Analyse in progress" msgstr "" -#: models.py:2342 +#: models.py:2344 msgid "Analysed" msgstr "" -#: models.py:2343 +#: models.py:2345 msgid "Import pending" msgstr "" -#: models.py:2344 +#: models.py:2346 msgid "Import in progress" msgstr "" -#: models.py:2345 models.py:3184 +#: models.py:2347 models.py:3186 msgid "Finished with errors" msgstr "" -#: models.py:2346 models.py:3185 +#: models.py:2348 models.py:3187 msgid "Finished" msgstr "" -#: models.py:2347 +#: models.py:2349 msgid "Archived" msgstr "" -#: models.py:2362 +#: models.py:2364 msgid "Imported file" msgstr "" -#: models.py:2364 +#: models.py:2366 msgid "Associated images (zip file)" msgstr "" -#: models.py:2366 +#: models.py:2368 msgid "Encoding" msgstr "" -#: models.py:2368 +#: models.py:2370 msgid "Skip lines" msgstr "" -#: models.py:2369 templates/ishtar/import_list.html:51 +#: models.py:2371 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2372 +#: models.py:2374 msgid "Result file" msgstr "" -#: models.py:2375 templates/ishtar/import_list.html:57 +#: models.py:2377 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2381 +#: models.py:2383 msgid "Conservative import" msgstr "" -#: models.py:2385 +#: models.py:2387 msgid "End date" msgstr "" -#: models.py:2388 +#: models.py:2390 msgid "Remaining seconds" msgstr "" -#: models.py:2391 +#: models.py:2393 msgid "Import" msgstr "" -#: models.py:2420 +#: models.py:2422 msgid "Analyse" msgstr "" -#: models.py:2422 models.py:2425 +#: models.py:2424 models.py:2427 msgid "Re-analyse" msgstr "" -#: models.py:2423 +#: models.py:2425 msgid "Launch import" msgstr "" -#: models.py:2426 +#: models.py:2428 msgid "Re-import" msgstr "" -#: models.py:2427 +#: models.py:2429 msgid "Archive" msgstr "" -#: models.py:2429 +#: models.py:2431 msgid "Unarchive" msgstr "" -#: models.py:2430 widgets.py:198 templates/ishtar/form_delete.html:11 +#: models.py:2432 widgets.py:198 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2571 +#: models.py:2573 msgid "Organizations" msgstr "" -#: models.py:2573 +#: models.py:2575 msgid "Can view all Organizations" msgstr "" -#: models.py:2574 +#: models.py:2576 msgid "Can view own Organization" msgstr "" -#: models.py:2575 +#: models.py:2577 msgid "Can add own Organization" msgstr "" -#: models.py:2577 +#: models.py:2579 msgid "Can change own Organization" msgstr "" -#: models.py:2579 +#: models.py:2581 msgid "Can delete own Organization" msgstr "" -#: models.py:2614 +#: models.py:2616 msgid "Groups" msgstr "" -#: models.py:2619 +#: models.py:2621 msgid "Person types" msgstr "" -#: models.py:2631 +#: models.py:2633 msgid "Title types" msgstr "" -#: models.py:2640 +#: models.py:2642 msgid "Mr" msgstr "" -#: models.py:2641 +#: models.py:2643 msgid "Miss" msgstr "" -#: models.py:2642 +#: models.py:2644 msgid "Mr and Mrs" msgstr "" -#: models.py:2643 +#: models.py:2645 msgid "Mrs" msgstr "" -#: models.py:2644 +#: models.py:2646 msgid "Doctor" msgstr "" -#: models.py:2677 +#: models.py:2679 msgid "Contact type" msgstr "" -#: models.py:2680 models.py:2744 +#: models.py:2682 models.py:2746 msgid "Types" msgstr "" -#: models.py:2683 +#: models.py:2685 msgid "Is attached to" msgstr "" -#: models.py:2688 +#: models.py:2690 msgid "Persons" msgstr "" -#: models.py:2690 +#: models.py:2692 msgid "Can view all Persons" msgstr "" -#: models.py:2691 +#: models.py:2693 msgid "Can view own Person" msgstr "" -#: models.py:2692 +#: models.py:2694 msgid "Can add own Person" msgstr "" -#: models.py:2693 +#: models.py:2695 msgid "Can change own Person" msgstr "" -#: models.py:2694 +#: models.py:2696 msgid "Can delete own Person" msgstr "" -#: models.py:2883 +#: models.py:2885 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2886 +#: models.py:2888 msgid "Ishtar user" msgstr "" -#: models.py:2887 +#: models.py:2889 msgid "Ishtar users" msgstr "" -#: models.py:2927 +#: models.py:2929 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2935 +#: models.py:2937 msgid "Author types" msgstr "" -#: models.py:2952 +#: models.py:2954 msgid "Can view all Authors" msgstr "" -#: models.py:2954 +#: models.py:2956 msgid "Can view own Author" msgstr "" -#: models.py:2956 +#: models.py:2958 msgid "Can add own Author" msgstr "" -#: models.py:2958 +#: models.py:2960 msgid "Can change own Author" msgstr "" -#: models.py:2960 +#: models.py:2962 msgid "Can delete own Author" msgstr "" -#: models.py:2981 +#: models.py:2983 msgid "Source types" msgstr "" -#: models.py:2990 +#: models.py:2992 msgid "Support types" msgstr "" -#: models.py:2997 +#: models.py:2999 msgid "Format type" msgstr "" -#: models.py:2998 +#: models.py:3000 msgid "Format types" msgstr "" -#: models.py:3006 +#: models.py:3008 msgid "External ID" msgstr "" -#: models.py:3009 +#: models.py:3011 msgid "Support" msgstr "" -#: models.py:3013 +#: models.py:3015 msgid "Scale" msgstr "" -#: models.py:3027 +#: models.py:3029 msgid "Item number" msgstr "" -#: models.py:3028 +#: models.py:3030 msgid "Ref." msgstr "" -#: models.py:3031 +#: models.py:3033 msgid "Internal ref." msgstr "" -#: models.py:3074 +#: models.py:3076 msgid "Surface (m2)" msgstr "" -#: models.py:3075 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3077 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Lokalisierung" -#: models.py:3100 +#: models.py:3102 msgid "Is preventive" msgstr "" -#: models.py:3104 +#: models.py:3106 msgid "Operation types" msgstr "" -#: models.py:3133 +#: models.py:3135 msgid "Preventive" msgstr "" -#: models.py:3134 +#: models.py:3136 msgid "Research" msgstr "" -#: models.py:3157 +#: models.py:3159 msgid "Authority name" msgstr "" -#: models.py:3158 +#: models.py:3160 msgid "Authority SRID" msgstr "" -#: models.py:3162 +#: models.py:3164 msgid "Spatial reference systems" msgstr "" -#: models.py:3169 +#: models.py:3171 msgid "Filename" msgstr "" -#: models.py:3174 +#: models.py:3176 msgid "Administration script" msgstr "" -#: models.py:3175 +#: models.py:3177 msgid "Administration scripts" msgstr "" -#: models.py:3182 +#: models.py:3184 msgid "Scheduled" msgstr "" -#: models.py:3183 +#: models.py:3185 msgid "In progress" msgstr "" -#: models.py:3198 +#: models.py:3200 msgid "Result" msgstr "" -#: models.py:3201 +#: models.py:3203 msgid "Administration task" msgstr "" -#: models.py:3202 +#: models.py:3204 msgid "Administration tasks" msgstr "" -#: models.py:3206 +#: models.py:3208 msgid "Unknown" msgstr "" -#: models.py:3221 +#: models.py:3223 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: models.py:3230 +#: models.py:3232 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: models.py:3241 +#: models.py:3243 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: models.py:3257 +#: models.py:3259 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." @@ -1675,31 +1679,31 @@ msgstr "" msgid "Treatments" msgstr "" -#: views.py:1723 templates/ishtar/import_list.html:47 +#: views.py:1724 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "" -#: views.py:1738 +#: views.py:1739 msgid "Delete import" msgstr "" -#: views.py:1777 +#: views.py:1778 msgid "Merge persons" msgstr "" -#: views.py:1801 +#: views.py:1802 msgid "Select the main person" msgstr "" -#: views.py:1810 +#: views.py:1811 msgid "Merge organization" msgstr "" -#: views.py:1820 +#: views.py:1821 msgid "Select the main organization" msgstr "" -#: views.py:1860 views.py:1876 +#: views.py:1861 views.py:1877 msgid "Corporation manager" msgstr "" @@ -1727,7 +1731,7 @@ msgstr "" msgid "No" msgstr "" -#: wizards.py:1404 +#: wizards.py:1409 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index cef69d5c5..9e8696e18 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -10,18 +10,18 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-04-07 06:31-0400\n" +"PO-Revision-Date: 2017-07-31 06:00-0400\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:47 forms.py:51 models.py:217 models.py:600 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:231 models.py:620 wizards.py:77 msgid "Operation" msgstr "Opération" -#: forms.py:59 forms.py:142 models.py:219 models.py:568 +#: forms.py:59 forms.py:142 models.py:233 models.py:588 msgid "ID" msgstr "Identifiant" @@ -45,7 +45,7 @@ msgstr "Entité archéologique" msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:78 forms.py:255 models.py:56 +#: forms.py:78 forms.py:259 models.py:56 msgid "Period" msgstr "Période" @@ -61,7 +61,7 @@ msgstr "Parcelle (section/numéro/domaine public)" msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: forms.py:112 forms.py:359 views.py:92 +#: forms.py:112 forms.py:363 views.py:92 msgid "Context record search" msgstr "Rechercher une Unité d'Enregistrement" @@ -73,64 +73,72 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." msgid "General" msgstr "Général" -#: forms.py:141 models.py:181 models.py:215 models.py:570 +#: forms.py:141 models.py:195 models.py:229 models.py:590 msgid "Parcel" msgstr "Parcelle" -#: forms.py:144 models.py:220 models.py:571 -#: templates/ishtar/sheet_contextrecord.html:30 +#: forms.py:144 models.py:234 models.py:591 +#: templates/ishtar/sheet_contextrecord.html:33 msgid "Description" msgstr "Description" -#: forms.py:146 models.py:221 +#: forms.py:146 models.py:235 msgid "General comment" msgstr "Commentaire général" -#: forms.py:149 models.py:268 +#: forms.py:149 models.py:282 msgid "Excavation technique" msgstr "Méthode de fouille" -#: forms.py:150 models.py:225 +#: forms.py:150 models.py:239 msgid "Length (m)" msgstr "Taille (m)" -#: forms.py:151 models.py:226 +#: forms.py:151 models.py:240 msgid "Width (m)" msgstr "Largeur (m)" -#: forms.py:152 models.py:227 +#: forms.py:152 models.py:241 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: forms.py:153 models.py:229 +#: forms.py:153 models.py:243 msgid "Diameter (m)" msgstr "Diamètre (m)" -#: forms.py:154 models.py:230 +#: forms.py:154 models.py:244 msgid "Depth (m)" msgstr "Profondeur (m)" -#: forms.py:156 models.py:232 +#: forms.py:156 models.py:246 msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition" -#: forms.py:157 forms.py:379 models.py:242 models.py:569 +#: forms.py:157 forms.py:383 models.py:256 models.py:589 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" -#: forms.py:160 ishtar_menu.py:48 +#: forms.py:159 models.py:236 +msgid "Opening date" +msgstr "Date d'ouverture" + +#: forms.py:161 models.py:238 templates/ishtar/sheet_contextrecord.html:87 +msgid "Closing date" +msgstr "Date de clôture" + +#: forms.py:164 ishtar_menu.py:48 msgid "Documentation" msgstr "Documentation" -#: forms.py:163 models.py:234 +#: forms.py:167 models.py:248 msgid "Location" msgstr "Lieu" -#: forms.py:166 +#: forms.py:170 msgid "Image" msgstr "Image" -#: forms.py:167 +#: forms.py:171 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

" -#: forms.py:244 +#: forms.py:248 msgid "This ID already exists for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: forms.py:250 forms.py:277 models.py:67 +#: forms.py:254 forms.py:281 models.py:67 msgid "Dating" msgstr "Datation" -#: forms.py:256 models.py:57 +#: forms.py:260 models.py:57 msgid "Start date" msgstr "Date de début" -#: forms.py:257 models.py:58 models.py:224 +#: forms.py:261 models.py:58 msgid "End date" msgstr "Date de fin" -#: forms.py:258 models.py:61 +#: forms.py:262 models.py:61 msgid "Quality" msgstr "Qualité" -#: forms.py:259 models.py:39 models.py:59 +#: forms.py:263 models.py:39 models.py:59 msgid "Dating type" msgstr "Type de datation" -#: forms.py:286 ishtar_menu.py:29 models.py:642 +#: forms.py:290 ishtar_menu.py:29 models.py:662 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:308 +#: forms.py:312 msgid "Relations" msgstr "Relations" -#: forms.py:312 forms.py:320 models.py:245 -#: templates/ishtar/sheet_contextrecord.html:44 +#: forms.py:316 forms.py:324 models.py:259 +#: templates/ishtar/sheet_contextrecord.html:47 msgid "Interpretation" msgstr "Interprétation" -#: forms.py:316 +#: forms.py:320 msgid "Comments on dating" msgstr "Commentaires sur la datation" -#: forms.py:318 models.py:244 +#: forms.py:322 models.py:258 msgid "Filling" msgstr "Remplissage" -#: forms.py:322 models.py:265 +#: forms.py:326 models.py:279 msgid "Activity" msgstr "Activité" -#: forms.py:324 models.py:263 +#: forms.py:328 models.py:277 msgid "Identification" msgstr "Identification" -#: forms.py:326 models.py:248 +#: forms.py:330 models.py:262 msgid "TAQ" msgstr "TAQ" -#: forms.py:327 models.py:252 +#: forms.py:331 models.py:266 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: forms.py:329 models.py:255 +#: forms.py:333 models.py:269 msgid "TPQ" msgstr "TPQ" -#: forms.py:330 models.py:259 +#: forms.py:334 models.py:273 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: forms.py:345 +#: forms.py:349 msgid "Operation search" msgstr "Rechercher une opération" -#: forms.py:347 +#: forms.py:351 msgid "You should select an operation." msgstr "Vous devez sélectionner une Opération." -#: forms.py:352 +#: forms.py:356 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: forms.py:361 +#: forms.py:365 msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." -#: forms.py:366 +#: forms.py:370 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:368 +#: forms.py:372 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:375 +#: forms.py:379 msgid "Town of the operation" msgstr "Commune de l'opération" -#: forms.py:377 +#: forms.py:381 msgid "Period of the context record" msgstr "Période de l'Unité d'Enregistrement" -#: forms.py:392 +#: forms.py:396 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:394 +#: forms.py:398 msgid "You should select a document." msgstr "Vous devez sélectionner un document." @@ -284,99 +292,95 @@ msgstr "Datation précise" msgid "Datings" msgstr "Datations" -#: models.py:79 models.py:96 models.py:110 +#: models.py:93 models.py:110 models.py:124 msgid "Order" msgstr "Ordre" -#: models.py:81 +#: models.py:95 msgid "Parent context record type" msgstr "Type d'UE parent" -#: models.py:85 +#: models.py:99 msgid "Context record Type" msgstr "Type d'Unité d'Enregistrement" -#: models.py:86 +#: models.py:100 msgid "Context record Types" msgstr "Types d'Unité d'Enregistrement" -#: models.py:99 +#: models.py:113 msgid "Activity Type" msgstr "Type d'activité" -#: models.py:100 +#: models.py:114 msgid "Activity Types" msgstr "Types d'activité" -#: models.py:113 +#: models.py:127 msgid "Identification Type" msgstr "Type d'identification" -#: models.py:114 +#: models.py:128 msgid "Identification Types" msgstr "Types d'identification" -#: models.py:125 +#: models.py:139 msgid "Excavation technique type" msgstr "Type de méthode de fouille" -#: models.py:126 +#: models.py:140 msgid "Excavation technique types" msgstr "Types de méthode de fouille" -#: models.py:134 +#: models.py:148 msgid "Documentation type" msgstr "Type de documentation" -#: models.py:135 +#: models.py:149 msgid "Documentation types" msgstr "Types de documentation" -#: models.py:172 models.py:572 +#: models.py:186 models.py:592 msgid "Periods" msgstr "Périodes" -#: models.py:173 +#: models.py:187 msgid "Datings (period)" msgstr "Datations (période)" -#: models.py:174 +#: models.py:188 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: models.py:177 +#: models.py:191 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant externe)" -#: models.py:178 models.py:179 +#: models.py:192 models.py:193 msgid "Parcel (town)" msgstr "Parcelle (commune)" -#: models.py:180 +#: models.py:194 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: models.py:212 +#: models.py:226 msgid "External ID" msgstr "ID externe" -#: models.py:214 +#: models.py:228 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:222 -msgid "Date d'ouverture" -msgstr "Date d'ouverture" - -#: models.py:235 +#: models.py:249 msgid "A short description of the location of the context record" msgstr "Une courte description de la localisation de l'Unité d'Enregistrement" -#: models.py:240 +#: models.py:254 msgid "Comment on datings" msgstr "Commentaire sur les datations" -#: models.py:249 +#: models.py:263 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -384,11 +388,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date." -#: models.py:253 +#: models.py:267 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »." -#: models.py:256 +#: models.py:270 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -396,136 +400,136 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date." -#: models.py:260 +#: models.py:274 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »." -#: models.py:271 +#: models.py:285 msgid "Point" msgstr "Point" -#: models.py:272 +#: models.py:286 msgid "Polygon" msgstr "Polygone" -#: models.py:273 +#: models.py:287 msgid "Cached name" msgstr "Nom en cache" -#: models.py:277 models.py:278 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:291 models.py:292 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models.py:280 +#: models.py:294 msgid "Can view all Context Records" msgstr "Peut voir toutes les Unités d'Enregistrement" -#: models.py:282 +#: models.py:296 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: models.py:284 +#: models.py:298 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: models.py:286 +#: models.py:300 msgid "Can change own Context Record" msgstr "Peut modifier sa propre Unité d'Enregistrement" -#: models.py:288 +#: models.py:302 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:298 +#: models.py:312 msgctxt "short" msgid "Context record" msgstr "UE" -#: models.py:502 +#: models.py:522 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:506 models.py:529 models.py:567 +#: models.py:526 models.py:549 models.py:587 msgid "Relation type" msgstr "Type de relation" -#: models.py:507 +#: models.py:527 msgid "Relation types" msgstr "Types de relation" -#: models.py:524 +#: models.py:544 msgid "ID (left)" msgstr "ID (gauche)" -#: models.py:525 +#: models.py:545 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: models.py:526 +#: models.py:546 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: models.py:527 +#: models.py:547 msgid "Description (left)" msgstr "Description (gauche)" -#: models.py:528 +#: models.py:548 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: models.py:530 +#: models.py:550 msgid "ID (right)" msgstr "ID (droit)" -#: models.py:531 +#: models.py:551 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: models.py:532 +#: models.py:552 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: models.py:533 +#: models.py:553 msgid "Description (right)" msgstr "Description (droite)" -#: models.py:534 +#: models.py:554 msgid "Periods (right)" msgstr "Périodes (droite)" -#: models.py:543 +#: models.py:563 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: models.py:544 +#: models.py:564 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:627 +#: models.py:647 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:628 +#: models.py:648 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" -#: models.py:631 +#: models.py:651 msgid "Can view all Context record sources" msgstr "Peut voir toutes les Documentations d'unité d'enregistrement" -#: models.py:633 +#: models.py:653 msgid "Can view own Context record source" msgstr "Peut voir sa propre Documentation d'unité d'enregistrement" -#: models.py:635 +#: models.py:655 msgid "Can add own Context record source" msgstr "Peut ajouter sa propre Documentation d'unité d'enregistrement" -#: models.py:637 +#: models.py:657 msgid "Can change own Context record source" msgstr "Peut modifier sa propre Documentation d'unité d'enregistrement" -#: models.py:639 +#: models.py:659 msgid "Can delete own Context record source" msgstr "Peut supprimer sa propre Documentation d'unité d'enregistrement" @@ -565,71 +569,67 @@ msgstr "ID complet" msgid "Temporary ID" msgstr "ID temporaire" -#: templates/ishtar/sheet_contextrecord.html:56 +#: templates/ishtar/sheet_contextrecord.html:59 msgid "Datations" msgstr "Datations" -#: templates/ishtar/sheet_contextrecord.html:65 +#: templates/ishtar/sheet_contextrecord.html:68 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:72 +#: templates/ishtar/sheet_contextrecord.html:75 msgid "Operation summary" msgstr "Résumé de l'opération" -#: templates/ishtar/sheet_contextrecord.html:74 +#: templates/ishtar/sheet_contextrecord.html:77 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" -#: templates/ishtar/sheet_contextrecord.html:78 +#: templates/ishtar/sheet_contextrecord.html:81 msgid "Numerical reference" msgstr "Référence numérique" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:85 msgid "State" msgstr "État" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:85 msgid "Active file" msgstr "Dossier actif" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:85 msgid "Closed operation" msgstr "Opération close" -#: templates/ishtar/sheet_contextrecord.html:84 -msgid "Closing date" -msgstr "Date de clôture" - -#: templates/ishtar/sheet_contextrecord.html:84 +#: templates/ishtar/sheet_contextrecord.html:87 msgid "by" msgstr "par" -#: templates/ishtar/sheet_contextrecord.html:92 +#: templates/ishtar/sheet_contextrecord.html:95 msgid "Localisation" msgstr "Lieu" -#: templates/ishtar/sheet_contextrecord.html:93 +#: templates/ishtar/sheet_contextrecord.html:96 msgid "Towns" msgstr "Communes" -#: templates/ishtar/sheet_contextrecord.html:94 +#: templates/ishtar/sheet_contextrecord.html:97 msgid "Related operation" msgstr "Opération associée" -#: templates/ishtar/sheet_contextrecord.html:96 +#: templates/ishtar/sheet_contextrecord.html:99 msgid "No operation linked to this context unit!" msgstr "Pas d'opération rattachée à cette UE !" -#: templates/ishtar/sheet_contextrecord.html:99 +#: templates/ishtar/sheet_contextrecord.html:102 msgid "Document from this context record" msgstr "Document associé à cette Unité d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:104 +#: templates/ishtar/sheet_contextrecord.html:107 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_contextrecord.html:109 +#: templates/ishtar/sheet_contextrecord.html:112 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 129e58cae..6dcaa258f 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -22,8 +22,8 @@ msgstr "" msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1160 -#: models_finds.py:1181 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1166 +#: models_finds.py:1187 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" @@ -212,13 +212,13 @@ msgid "Period" msgstr "Période" #: forms.py:316 forms_treatments.py:138 forms_treatments.py:283 -#: forms_treatments.py:481 models_finds.py:1186 models_treatments.py:130 +#: forms_treatments.py:481 models_finds.py:1192 models_treatments.py:130 #: models_treatments.py:309 templates/ishtar/sheet_find.html:94 #: templates/ishtar/sheet_find.html:136 msgid "Start date" msgstr "Date de début" -#: forms.py:318 models_finds.py:1187 models_treatments.py:310 +#: forms.py:318 models_finds.py:1193 models_treatments.py:310 #: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137 msgid "End date" msgstr "Date de fin" @@ -395,7 +395,7 @@ msgstr "Index" msgid "Treatment type" msgstr "Type de traitement" -#: forms_treatments.py:68 forms_treatments.py:650 views.py:398 +#: forms_treatments.py:68 forms_treatments.py:650 views.py:401 msgid "Treatment search" msgstr "Rechercher un traitement" @@ -492,7 +492,7 @@ msgstr "Demande associée" #: forms_treatments.py:267 forms_treatments.py:442 ishtar_menu.py:108 #: models_treatments.py:516 models_treatments.py:544 models_treatments.py:619 -#: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 +#: wizards.py:188 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "Demande de traitement" @@ -602,7 +602,7 @@ msgstr "Demandeur" msgid "Applicant organisation" msgstr "Organisation du demandeur" -#: forms_treatments.py:430 forms_treatments.py:655 views.py:502 +#: forms_treatments.py:430 forms_treatments.py:655 views.py:505 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" @@ -685,7 +685,7 @@ msgstr "Gestion des éléments" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1183 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1189 msgid "Administrative act" msgstr "Acte administratif" @@ -968,43 +968,43 @@ msgstr "Peut supprimer son propre Mobilier" msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:1146 +#: models_finds.py:1152 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:1147 +#: models_finds.py:1153 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:1150 +#: models_finds.py:1156 msgid "Can view all Find sources" msgstr "Peut voir toutes les Documentations de mobilier" -#: models_finds.py:1152 +#: models_finds.py:1158 msgid "Can view own Find source" msgstr "Peut voir sa propre Documentation de mobilier" -#: models_finds.py:1154 +#: models_finds.py:1160 msgid "Can add own Find source" msgstr "Peut ajouter sa propre Documentation de mobilier" -#: models_finds.py:1156 +#: models_finds.py:1162 msgid "Can change own Find source" msgstr "Peut modifier sa propre Documentation de mobilier" -#: models_finds.py:1158 +#: models_finds.py:1164 msgid "Can delete own Find source" msgstr "Peut suprimer sa propre Documentation de mobilier" -#: models_finds.py:1184 +#: models_finds.py:1190 msgid "Person" msgstr "Individu" -#: models_finds.py:1190 +#: models_finds.py:1196 msgid "Property" msgstr "Propriété" -#: models_finds.py:1191 +#: models_finds.py:1197 msgid "Properties" msgstr "Propriétés" @@ -1236,119 +1236,119 @@ msgstr "Ajouter un mobilier" msgid "Find modification" msgstr "Modifier un mobilier" -#: views.py:189 +#: views.py:192 msgid "Find deletion" msgstr "Supprimer un mobilier" -#: views.py:194 +#: views.py:197 msgid "Find: source search" msgstr "Mobilier : rechercher une documentation associée" -#: views.py:202 +#: views.py:205 msgid "Find: new source" msgstr "Mobilier : ajouter une documentation associée" -#: views.py:210 +#: views.py:213 msgid "Find: source modification" msgstr "Mobilier : modifier une documentation associée" -#: views.py:225 +#: views.py:228 msgid "Find: source deletion" msgstr "Mobilier : supprimer un mobilier associé" -#: views.py:239 +#: views.py:242 msgid "New basket" msgstr "Ajouter un panier" -#: views.py:258 +#: views.py:261 msgid "Manage items in basket" msgstr "Gérer les éléments dans un panier" -#: views.py:278 +#: views.py:281 msgid "Manage basket" msgstr "Gérer un panier" -#: views.py:369 +#: views.py:372 msgid "Delete basket" msgstr "Supprimer un panier" -#: views.py:419 +#: views.py:422 msgid "New treatment" msgstr "Ajouter un traitement" -#: views.py:427 views.py:519 +#: views.py:430 views.py:522 msgid "Modify" msgstr "Modifier" -#: views.py:444 +#: views.py:447 msgid "Treatment deletion" msgstr "Supprimer un traitement" -#: views.py:451 +#: views.py:454 msgid "Treatment: search administrative act" msgstr "Traitement : rechercher un acte administratif" -#: views.py:460 +#: views.py:463 msgid "Treatment: new administrative act" msgstr "Traitement : ajouter un acte administratif" -#: views.py:470 +#: views.py:473 msgid "Treatment: administrative act modification" msgstr "Traitement : modifier un acte administratif" -#: views.py:479 +#: views.py:482 msgid "Treatment: administrative act deletion" msgstr "Traitement : supprimer un acte administratif" -#: views.py:512 +#: views.py:515 msgid "New treatment request" msgstr "Ajouter une demande de traitement" -#: views.py:535 +#: views.py:538 msgid "Treatment request deletion" msgstr "Supprimer une demande de traitement" -#: views.py:542 +#: views.py:545 msgid "Treatment request: search administrative act" msgstr "Demande de traitement : rechercher un acte administratif" -#: views.py:552 +#: views.py:555 msgid "Treatment request: new administrative act" msgstr "Demande de traitement : ajouter un acte administratif" -#: views.py:562 +#: views.py:565 msgid "Treatment request: administrative act modification" msgstr "Demande de traitement : modifier un acte administratif" -#: views.py:571 +#: views.py:574 msgid "Treatment request: administrative act deletion" msgstr "Demande de traitement : supprimer un acte administratif" -#: views.py:597 +#: views.py:600 msgid "Treatment: source search" msgstr "Traitement : rechercher une documentation associée" -#: views.py:612 +#: views.py:615 msgid "Treatment: source modification" msgstr "Traitement : modifier une documentation associée" -#: views.py:627 +#: views.py:630 msgid "Treatment: source deletion" msgstr "Traitement : supprimer une documentation associée" -#: views.py:640 +#: views.py:643 msgid "Treatment request: source search" msgstr "Demande de traitement : rechercher une documentation associée" -#: views.py:656 +#: views.py:659 msgid "Treatment request: source modification" msgstr "Demande de traitement : modifier une documentation associée" -#: views.py:674 +#: views.py:677 msgid "Treatment request: source deletion" msgstr "Demande de traitement : supprimer une documentation associée" -#: wizards.py:63 wizards.py:199 +#: wizards.py:63 wizards.py:200 msgid "Operation" msgstr "Opération" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 7d6ba7163..610a12fe0 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -553,7 +553,7 @@ msgstr "Indexé ?" msgid "Object" msgstr "Objet" -#: forms.py:1359 views.py:350 +#: forms.py:1359 views.py:354 msgid "Administrative act search" msgstr "Rechercher un acte administratif" @@ -598,7 +598,7 @@ msgstr "Génération de document" msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: forms.py:1523 ishtar_menu.py:123 views.py:403 +#: forms.py:1523 ishtar_menu.py:123 views.py:407 msgctxt "admin act register" msgid "Register" msgstr "Registre" @@ -1105,23 +1105,23 @@ msgstr "Opération : rechercher une documentation associée" msgid "Operation: source creation" msgstr "Opération : ajouter une documentation associée" -#: views.py:329 +#: views.py:333 msgid "Operation: source modification" msgstr "Opération : modifier une documentation associée" -#: views.py:344 +#: views.py:348 msgid "Operation: source deletion" msgstr "Opération : supprimer une documentation associée" -#: views.py:363 +#: views.py:367 msgid "Operation: new administrative act" msgstr "Opération : ajouter un acte administratif" -#: views.py:373 +#: views.py:377 msgid "Operation: administrative act modification" msgstr "Opération : modification d'un acte administratif" -#: views.py:397 +#: views.py:401 msgid "Operation: administrative act deletion" msgstr "Opération : supprimer un acte administratif" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index dc6c88863..3b8e41e07 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -12,7 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-06-01 02:08-0400\n" +"PO-Revision-Date: 2017-07-31 06:01-0400\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" "Language: fr\n" @@ -35,54 +35,54 @@ msgstr "Élément associé" msgid "Export selected as CSV file" msgstr "Exporter la sélection en fichier CSV" -#: data_importer.py:192 +#: data_importer.py:193 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" "\"%(value)s\" est trop long. La longueur maximum est de %(length)d " "caractères." -#: data_importer.py:209 +#: data_importer.py:210 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "\"%(value)s\" diffère de oui ou non" -#: data_importer.py:221 +#: data_importer.py:222 #, python-format msgid "\"%(value)s\" is not a float" msgstr "\"%(value)s\" n'est pas un nombre à virgule" -#: data_importer.py:234 data_importer.py:248 data_importer.py:502 +#: data_importer.py:235 data_importer.py:249 data_importer.py:503 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "\"%(value)s\" n'est pas une date valide" -#: data_importer.py:261 +#: data_importer.py:262 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "\"%(value)s\" n'est pas un entier" -#: data_importer.py:318 data_importer.py:567 +#: data_importer.py:319 data_importer.py:568 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "Le choix pour \"%s\" n'est pas disponible. Lequel est pertinent ?\n" -#: data_importer.py:325 +#: data_importer.py:326 #, python-format msgid "%d. None of the above - create new" msgstr "%d. Aucun de ceux-là - créer un nouveau" -#: data_importer.py:328 +#: data_importer.py:329 #, python-format msgid "%d. None of the above - skip" msgstr "%d. Aucun de ceux-là - passer" -#: data_importer.py:528 +#: data_importer.py:529 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "\"%(value)s\" n'est pas un chemin valide pour cette archive" -#: data_importer.py:644 +#: data_importer.py:645 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " @@ -92,29 +92,29 @@ msgstr "" "utilisez un fichier CSV : vérifiez que le séparateur de colonnes et " "l'encodage sont similaires à ceux du fichier de référence." -#: data_importer.py:648 +#: data_importer.py:649 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d" -#: data_importer.py:650 +#: data_importer.py:651 msgid "No data provided" msgstr "Aucune donnée fournie" -#: data_importer.py:651 +#: data_importer.py:652 msgid "Value is required" msgstr "Valeur requise" -#: data_importer.py:652 +#: data_importer.py:653 #, python-format msgid "At least %d columns must be filled" msgstr "Au moins %d colonnes doivent être remplies" -#: data_importer.py:653 +#: data_importer.py:654 msgid "The regexp doesn't match." msgstr "L'expression régulière ne fonctionne pas." -#: data_importer.py:655 +#: data_importer.py:656 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." @@ -122,7 +122,7 @@ msgstr "" "La création forcée est possible pour le modèle {} mais ce modèle ne fait pas " "partie de la liste des créations de modèle autorisées." -#: data_importer.py:657 +#: data_importer.py:658 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." @@ -130,41 +130,41 @@ msgstr "" "L'élément {} avec les valeurs {} n'existe pas dans la base de données. Créez-" "le d'abord ou corrigez votre fichier source." -#: data_importer.py:1110 +#: data_importer.py:1111 msgid "Not imported" msgstr "Non importé" -#: data_importer.py:1247 +#: data_importer.py:1248 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" "Erreur de configuration de l'importeur : le champ \"{}\" n'existe pas pour " "{}." -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "line" msgstr "ligne" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "col" msgstr "colonne" -#: data_importer.py:1574 +#: data_importer.py:1577 msgid "error" msgstr "erreur" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "field" msgstr "champ" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "source" msgstr "source" -#: data_importer.py:1580 +#: data_importer.py:1583 msgid "result" msgstr "résultat" -#: data_importer.py:1596 +#: data_importer.py:1599 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -202,7 +202,7 @@ msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1624 models.py:3087 +#: forms_common.py:408 models.py:1624 models.py:3089 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -225,8 +225,8 @@ msgstr "" "

Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.

" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2687 -#: models.py:2880 models.py:2942 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2689 +#: models.py:2882 models.py:2944 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -239,15 +239,15 @@ msgstr "" "pas possible." #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2570 models.py:2661 +#: ishtar_menu.py:75 models.py:2572 models.py:2663 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 #: forms_common.py:378 forms_common.py:448 models.py:1161 models.py:1557 -#: models.py:1826 models.py:1842 models.py:2080 models.py:2358 models.py:2564 -#: models.py:2673 models.py:3073 models.py:3170 +#: models.py:1826 models.py:1842 models.py:2080 models.py:2360 models.py:2566 +#: models.py:2675 models.py:3075 models.py:3172 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 @@ -296,8 +296,8 @@ msgstr "Téléphone" msgid "Mobile phone" msgstr "Téléphone portable" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2249 -#: models.py:2566 models.py:3008 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2251 +#: models.py:2568 models.py:3010 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -321,7 +321,7 @@ msgstr "Fusionner tous les éléments dans" msgid "Organization to merge" msgstr "Organisation à fusionner" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2671 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2673 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" @@ -340,16 +340,16 @@ msgid "Identity" msgstr "Identité" #: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2212 -#: models.py:2665 models.py:2667 models.py:3005 templates/sheet_ope.html:104 +#: models.py:2667 models.py:2669 models.py:3007 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:374 models.py:2669 +#: forms_common.py:374 models.py:2671 msgid "Salutation" msgstr "Formule d'appel" -#: forms_common.py:380 models.py:2675 +#: forms_common.py:380 models.py:2677 msgid "Raw name" msgstr "Nom brut" @@ -409,7 +409,7 @@ msgstr "Nom d'utilisateur" msgid "Account search" msgstr "Rechercher un compte" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2618 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2620 msgid "Person type" msgstr "Type de personne" @@ -417,7 +417,7 @@ msgstr "Type de personne" msgid "Account" msgstr "Compte" -#: forms_common.py:577 wizards.py:1347 +#: forms_common.py:577 wizards.py:1352 msgid "New password" msgstr "Nouveau mot de passe" @@ -441,7 +441,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:636 forms_common.py:649 models.py:3088 +#: forms_common.py:636 forms_common.py:649 models.py:3090 msgid "Towns" msgstr "Communes" @@ -457,7 +457,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2980 +#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2982 msgid "Source type" msgstr "Type de document" @@ -469,37 +469,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:791 models.py:3019 +#: forms_common.py:791 models.py:3021 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:792 models.py:3021 +#: forms_common.py:792 models.py:3023 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:794 models.py:2384 models.py:3023 +#: forms_common.py:794 models.py:2386 models.py:3025 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:797 models.py:3026 +#: forms_common.py:797 models.py:3028 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" #: forms_common.py:799 forms_common.py:835 models.py:421 models.py:748 -#: models.py:2107 models.py:2679 models.py:3033 +#: models.py:2107 models.py:2681 models.py:3035 msgid "Comment" msgstr "Commentaire" #: forms_common.py:801 forms_common.py:834 models.py:1163 models.py:1846 -#: models.py:2034 models.py:2081 models.py:3032 templates/sheet_ope.html:128 +#: models.py:2034 models.py:2081 models.py:3034 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:804 models.py:3034 +#: forms_common.py:804 models.py:3036 msgid "Additional information" msgstr "Information supplémentaire" -#: forms_common.py:806 forms_common.py:838 models.py:3036 +#: forms_common.py:806 forms_common.py:838 models.py:3038 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -516,7 +516,7 @@ msgstr "" "

Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2947 +#: forms_common.py:827 forms_common.py:856 forms_common.py:891 models.py:2949 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -529,7 +529,7 @@ msgstr "Informations supplémentaires" msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:864 models.py:2214 models.py:2934 models.py:2944 +#: forms_common.py:864 models.py:2214 models.py:2936 models.py:2946 msgid "Author type" msgstr "Type d'auteur" @@ -537,11 +537,11 @@ msgstr "Type d'auteur" msgid "Author selection" msgstr "Sélection d'auteur" -#: forms_common.py:897 +#: forms_common.py:898 msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:901 models.py:2948 models.py:3015 +#: forms_common.py:902 models.py:2950 models.py:3017 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -559,7 +559,7 @@ msgstr "Ajout/modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1340 views.py:1648 +#: ishtar_menu.py:39 models.py:1340 views.py:1649 msgid "Global variables" msgstr "Variables globales" @@ -587,19 +587,19 @@ msgstr "Fusion automatique" msgid "Manual merge" msgstr "Fusion manuelle" -#: ishtar_menu.py:109 models.py:2392 +#: ishtar_menu.py:109 models.py:2394 msgid "Imports" msgstr "Imports" -#: ishtar_menu.py:112 views.py:1656 +#: ishtar_menu.py:112 views.py:1657 msgid "New import" msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1670 +#: ishtar_menu.py:116 views.py:1671 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1709 +#: ishtar_menu.py:120 views.py:1710 msgid "Old imports" msgstr "Anciens imports" @@ -643,7 +643,7 @@ msgstr "Dernier éditeur" msgid "Creator" msgstr "Créateur" -#: models.py:1021 models.py:2931 models.py:3099 models.py:3155 +#: models.py:1021 models.py:2933 models.py:3101 models.py:3157 msgid "Order" msgstr "Ordre" @@ -929,7 +929,7 @@ msgstr "Patron de document" msgid "Document templates" msgstr "Patrons de document" -#: models.py:1596 models.py:1606 models.py:2378 models.py:3193 +#: models.py:1596 models.py:1606 models.py:2380 models.py:3195 msgid "State" msgstr "État" @@ -1121,11 +1121,11 @@ msgstr "Importeur - Clé de rapprochement" msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2215 models.py:3011 +#: models.py:2215 models.py:3013 msgid "Format" msgstr "Format" -#: models.py:2216 models.py:3103 +#: models.py:2216 models.py:3105 msgid "Operation type" msgstr "Type d'opération" @@ -1149,471 +1149,475 @@ msgstr "Unité" msgid "Activity type" msgstr "Type d'activité" -#: models.py:2223 +#: models.py:2224 +msgid "Documentation type" +msgstr "Type de documentation" + +#: models.py:2225 msgid "Material" msgstr "Matériau" -#: models.py:2225 +#: models.py:2227 msgid "Conservatory state" msgstr "État de conservation" -#: models.py:2226 +#: models.py:2228 msgid "Container type" msgstr "Type de contenant" -#: models.py:2227 +#: models.py:2229 msgid "Preservation type" msgstr "Type de conservation" -#: models.py:2228 +#: models.py:2230 msgid "Object type" msgstr "Type d'objet" -#: models.py:2229 +#: models.py:2231 msgid "Integrity type" msgstr "Type d'intégrité" -#: models.py:2231 +#: models.py:2233 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: models.py:2232 +#: models.py:2234 msgid "Batch type" msgstr "Type de lot" -#: models.py:2234 +#: models.py:2236 msgid "Identification type" msgstr "Type d'identification" -#: models.py:2236 +#: models.py:2238 msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2237 models.py:3161 +#: models.py:2239 models.py:3163 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: models.py:2238 models.py:2989 +#: models.py:2240 models.py:2991 msgid "Support type" msgstr "Type de support" -#: models.py:2239 models.py:2630 +#: models.py:2241 models.py:2632 msgid "Title type" msgstr "Type de titre" -#: models.py:2245 +#: models.py:2247 msgid "Integer" msgstr "Entier" -#: models.py:2246 +#: models.py:2248 msgid "Float" msgstr "Nombre à virgule" -#: models.py:2247 +#: models.py:2249 msgid "String" msgstr "Chaîne de caractères" -#: models.py:2248 templates/sheet_ope.html:86 +#: models.py:2250 templates/sheet_ope.html:86 msgid "Date" msgstr "Date" -#: models.py:2250 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2252 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "Année" -#: models.py:2251 +#: models.py:2253 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: models.py:2252 +#: models.py:2254 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: models.py:2253 +#: models.py:2255 msgid "Unknow type" msgstr "Type inconnu" -#: models.py:2269 +#: models.py:2271 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: models.py:2270 +#: models.py:2272 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: models.py:2271 +#: models.py:2273 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: models.py:2281 +#: models.py:2283 msgid "Options" msgstr "Options" -#: models.py:2283 +#: models.py:2285 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: models.py:2287 +#: models.py:2289 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: models.py:2288 +#: models.py:2290 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: models.py:2340 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2342 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "Créé" -#: models.py:2341 +#: models.py:2343 msgid "Analyse in progress" msgstr "Analyse en cours" -#: models.py:2342 +#: models.py:2344 msgid "Analysed" msgstr "Analysé" -#: models.py:2343 +#: models.py:2345 msgid "Import pending" msgstr "Import en attente" -#: models.py:2344 +#: models.py:2346 msgid "Import in progress" msgstr "Import en cours" -#: models.py:2345 models.py:3184 +#: models.py:2347 models.py:3186 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: models.py:2346 models.py:3185 +#: models.py:2348 models.py:3187 msgid "Finished" msgstr "Terminé" -#: models.py:2347 +#: models.py:2349 msgid "Archived" msgstr "Archivé" -#: models.py:2362 +#: models.py:2364 msgid "Imported file" msgstr "Fichier importé" -#: models.py:2364 +#: models.py:2366 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:2366 +#: models.py:2368 msgid "Encoding" msgstr "Codage" -#: models.py:2368 +#: models.py:2370 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:2369 templates/ishtar/import_list.html:51 +#: models.py:2371 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "Fichier erreur" -#: models.py:2372 +#: models.py:2374 msgid "Result file" msgstr "Fichier résultant" -#: models.py:2375 templates/ishtar/import_list.html:57 +#: models.py:2377 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:2381 +#: models.py:2383 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:2385 +#: models.py:2387 msgid "End date" msgstr "Date de fin" -#: models.py:2388 +#: models.py:2390 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:2391 +#: models.py:2393 msgid "Import" msgstr "Import" -#: models.py:2420 +#: models.py:2422 msgid "Analyse" msgstr "Analyser" -#: models.py:2422 models.py:2425 +#: models.py:2424 models.py:2427 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2423 +#: models.py:2425 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2426 +#: models.py:2428 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2427 +#: models.py:2429 msgid "Archive" msgstr "Archiver" -#: models.py:2429 +#: models.py:2431 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2430 widgets.py:198 templates/ishtar/form_delete.html:11 +#: models.py:2432 widgets.py:198 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "Supprimer" -#: models.py:2571 +#: models.py:2573 msgid "Organizations" msgstr "Organisations" -#: models.py:2573 +#: models.py:2575 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2574 +#: models.py:2576 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2575 +#: models.py:2577 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2577 +#: models.py:2579 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2579 +#: models.py:2581 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2614 +#: models.py:2616 msgid "Groups" msgstr "Groupes" -#: models.py:2619 +#: models.py:2621 msgid "Person types" msgstr "Types de personne" -#: models.py:2631 +#: models.py:2633 msgid "Title types" msgstr "Types de titre" -#: models.py:2640 +#: models.py:2642 msgid "Mr" msgstr "M." -#: models.py:2641 +#: models.py:2643 msgid "Miss" msgstr "Mlle" -#: models.py:2642 +#: models.py:2644 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2643 +#: models.py:2645 msgid "Mrs" msgstr "Mme" -#: models.py:2644 +#: models.py:2646 msgid "Doctor" msgstr "Dr." -#: models.py:2677 +#: models.py:2679 msgid "Contact type" msgstr "Type de contact" -#: models.py:2680 models.py:2744 +#: models.py:2682 models.py:2746 msgid "Types" msgstr "Types" -#: models.py:2683 +#: models.py:2685 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2688 +#: models.py:2690 msgid "Persons" msgstr "Personnes" -#: models.py:2690 +#: models.py:2692 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2691 +#: models.py:2693 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2692 +#: models.py:2694 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2693 +#: models.py:2695 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2694 +#: models.py:2696 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2883 +#: models.py:2885 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: models.py:2886 +#: models.py:2888 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2887 +#: models.py:2889 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2927 +#: models.py:2929 msgid "To modify the password use the form in Auth > User" msgstr "" "Pour modifier le mot de passe, utilisez le formulaire dans Authentification " "> Utilisateurs" -#: models.py:2935 +#: models.py:2937 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2952 +#: models.py:2954 msgid "Can view all Authors" msgstr "Peut voir tous les Auteurs" -#: models.py:2954 +#: models.py:2956 msgid "Can view own Author" msgstr "Peut voir son propre Auteur" -#: models.py:2956 +#: models.py:2958 msgid "Can add own Author" msgstr "Peut ajouter son propre Auteur" -#: models.py:2958 +#: models.py:2960 msgid "Can change own Author" msgstr "Peut modifier son propre Auteur" -#: models.py:2960 +#: models.py:2962 msgid "Can delete own Author" msgstr "Peut supprimer son propre Auteur" -#: models.py:2981 +#: models.py:2983 msgid "Source types" msgstr "Types de document" -#: models.py:2990 +#: models.py:2992 msgid "Support types" msgstr "Types de support" -#: models.py:2997 +#: models.py:2999 msgid "Format type" msgstr "Type de format" -#: models.py:2998 +#: models.py:3000 msgid "Format types" msgstr "Types de format" -#: models.py:3006 +#: models.py:3008 msgid "External ID" msgstr "Identifiant externe" -#: models.py:3009 +#: models.py:3011 msgid "Support" msgstr "Support" -#: models.py:3013 +#: models.py:3015 msgid "Scale" msgstr "Échelle" -#: models.py:3027 +#: models.py:3029 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:3028 +#: models.py:3030 msgid "Ref." msgstr "Réf." -#: models.py:3031 +#: models.py:3033 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:3074 +#: models.py:3076 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:3075 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3077 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:3100 +#: models.py:3102 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:3104 +#: models.py:3106 msgid "Operation types" msgstr "Types d'opération" -#: models.py:3133 +#: models.py:3135 msgid "Preventive" msgstr "Préventif" -#: models.py:3134 +#: models.py:3136 msgid "Research" msgstr "Programmé" -#: models.py:3157 +#: models.py:3159 msgid "Authority name" msgstr "Registre" -#: models.py:3158 +#: models.py:3160 msgid "Authority SRID" msgstr "SRID" -#: models.py:3162 +#: models.py:3164 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" -#: models.py:3169 +#: models.py:3171 msgid "Filename" msgstr "Nom de fichier" -#: models.py:3174 +#: models.py:3176 msgid "Administration script" msgstr "Script d'administration" -#: models.py:3175 +#: models.py:3177 msgid "Administration scripts" msgstr "Scripts d'administration" -#: models.py:3182 +#: models.py:3184 msgid "Scheduled" msgstr "Planifié" -#: models.py:3183 +#: models.py:3185 msgid "In progress" msgstr "En cours" -#: models.py:3198 +#: models.py:3200 msgid "Result" msgstr "Résultat" -#: models.py:3201 +#: models.py:3203 msgid "Administration task" msgstr "Tâche d'administration" -#: models.py:3202 +#: models.py:3204 msgid "Administration tasks" msgstr "Tâches d'administration" -#: models.py:3206 +#: models.py:3208 msgid "Unknown" msgstr "Inconnu" -#: models.py:3221 +#: models.py:3223 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." @@ -1621,7 +1625,7 @@ msgstr "" "ISHTAR_SCRIPT_DIR n'est pas défini dans votre fichier local_settings. " "Contactez votre administrateur." -#: models.py:3230 +#: models.py:3232 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " @@ -1632,11 +1636,11 @@ msgstr "" "problème de sécurité et cela n'est pas permis. Seul un chemin complet est " "permis." -#: models.py:3241 +#: models.py:3243 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "ISHTAR_SCRIPT_DIR: « {} » n'est pas un répertoire valable." -#: models.py:3257 +#: models.py:3259 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." @@ -1750,31 +1754,31 @@ msgstr "Demandes de traitement" msgid "Treatments" msgstr "Traitements" -#: views.py:1723 templates/ishtar/import_list.html:47 +#: views.py:1724 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1738 +#: views.py:1739 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:1777 +#: views.py:1778 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1801 +#: views.py:1802 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1810 +#: views.py:1811 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1820 +#: views.py:1821 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1860 views.py:1876 +#: views.py:1861 views.py:1877 msgid "Corporation manager" msgstr "Représentant de la personne morale" @@ -1802,7 +1806,7 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: wizards.py:1404 +#: wizards.py:1409 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création/modification du compte" -- cgit v1.2.3 From afe97dd3964f003c4c55d5abfe8f8ed523e6a1c1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 31 Jul 2017 17:15:06 +0200 Subject: Find forms: add discovery date (refs #3696) --- archaeological_finds/forms.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 2e7cc75f5..884bbe9a1 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -144,6 +144,8 @@ class FindForm(ManageOldType, forms.Form): previous_id = forms.CharField(label=_("Previous ID"), required=False) description = forms.CharField(label=_("Description"), widget=forms.Textarea, required=False) + get_first_base_find__discovery_date = forms.DateField( + label=_(u"Discovery date"), widget=widgets.JQueryDate, required=False) get_first_base_find__batch = forms.ChoiceField( label=_(u"Batch/object"), choices=[], required=False) -- cgit v1.2.3 From e7e161c2e610b442b4d72d9d749687ff87b993f9 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 29 Aug 2017 14:50:44 +0200 Subject: Sheet: add a specific sheet_address_section (refs #3401) --- archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 1 + ishtar_common/templates/ishtar/blocks/sheet_address_section.html | 6 ++++++ ishtar_common/templates/ishtar/sheet_organization.html | 5 +---- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_address_section.html diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index eb31392e4..3d39f9845 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -14,6 +14,7 @@ {% field_li "Person in charge" item.person_in_charge %} {% include "ishtar/blocks/sheet_creation_section.html" %} +{% include "ishtar/blocks/sheet_address_section.html" %} {% field "Comment" item.comment "
" "
" %} {% if item.containers.count %} diff --git a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html new file mode 100644 index 000000000..917258173 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html @@ -0,0 +1,6 @@ +{% load i18n %} +{% if item.address or item.address_complement or item.postal_code or item.town %} +

{% if item.address %}{{item.address}}{% endif %}{% if item.address_complement %}
+{{item.address_complement}}{% endif %}{% if item.postal_code or item.town %}
+{{item.postal_code}} {{item.town}}{% endif %}
+

{% endif %} diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html index 66048095b..411aa2de3 100644 --- a/ishtar_common/templates/ishtar/sheet_organization.html +++ b/ishtar_common/templates/ishtar/sheet_organization.html @@ -7,10 +7,7 @@ {% window_nav item window_id 'show-organization' 'organization_modify' %}

{{item.name}}

{{ item.history_creator.ishtaruser.person }}

-{% if item.address %}

{{item.address}}

{% endif %} -{% if item.address_complement %}

{{item.address_complement}}

{% endif %} -{% if item.postal_code %}

{{item.postal_code}}

{% endif %} -{% if item.town %}

{{item.town}}

{% endif %} +{% include "ishtar/blocks/sheet_address_section.html" %} {% if item.phone %}

{{item.phone}}

{% endif %} {% if item.mobile_phone %}

{{item.mobile_phone}}

{% endif %} -- cgit v1.2.3 From 45c062ade6edecce68e479b09117d8d75dde18a0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 29 Aug 2017 15:52:53 +0200 Subject: Finds: delete associated treatment on find deletion (refs #3723) --- archaeological_finds/models_finds.py | 18 +++++++++++++++++- archaeological_finds/tests.py | 23 +++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 78280bede..bc96ded25 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -24,7 +24,8 @@ from django.contrib.gis.db import models from django.core.urlresolvers import reverse from django.db import connection, transaction from django.db.models import Max, Q -from django.db.models.signals import m2m_changed, post_save, post_delete +from django.db.models.signals import m2m_changed, post_save, post_delete, \ + pre_delete from django.utils.translation import ugettext_lazy as _, ugettext from ishtar_common.utils import cached_label_changed, post_save_point @@ -1102,7 +1103,22 @@ class Find(ValueGetter, BaseHistorizedItem, ImageModel, OwnPerms, Dating.fix_dating_association(self) +def pre_clean_treatments(sender, **kwargs): + if not kwargs.get('instance'): + return + instance = kwargs.get('instance') + if instance.downstream_treatment: + # TODO: not managed for now. Raise an error? + return + if not instance.upstream_treatment: + return + instance.upstream_treatment.upstream.clear() + instance.upstream_treatment.downstream.clear() + instance.upstream_treatment.delete() + + post_save.connect(cached_label_changed, sender=Find) +pre_delete.connect(pre_clean_treatments, sender=Find) def base_find_find_changed(sender, **kwargs): diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index f8f134c0a..933b5f292 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -599,3 +599,26 @@ class PackagingTest(FindInit, TestCase): self.assertNotIn( item, self.finds, msg="Other basket have not been upgraded after packaging") + + def test_delete(self): + # manage treatment deletion + treatment_type = models.TreatmentType.objects.get(txt_idx='packaging') + treatment = models.Treatment() + + initial_find = self.finds[0] + treatment.save(user=self.get_default_user(), items=self.basket) + treatment.treatment_types.add(treatment_type) + + resulting_find = models.Find.objects.get( + upstream_treatment__upstream=initial_find, + base_finds__pk=initial_find.base_finds.all()[0].pk + ) + resulting_find.delete() + + self.assertEqual( + models.Treatment.objects.filter(pk=treatment.pk).count(), 0) + q = models.Find.objects.filter(pk=initial_find.pk) + # initial find not deleted + self.assertEqual(q.count(), 1) + initial_find = q.all()[0] + self.assertEqual(initial_find.upstream_treatment, None) -- cgit v1.2.3 From 066d7c88825a983997cfee9ac61003b5d48b35da Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 29 Aug 2017 16:13:34 +0200 Subject: Find deletions: delete associated base find (refs #3724) --- archaeological_finds/models_finds.py | 10 ++++++++-- archaeological_finds/tests.py | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index bc96ded25..66059079b 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1103,10 +1103,16 @@ class Find(ValueGetter, BaseHistorizedItem, ImageModel, OwnPerms, Dating.fix_dating_association(self) -def pre_clean_treatments(sender, **kwargs): +def pre_clean_find(sender, **kwargs): if not kwargs.get('instance'): return instance = kwargs.get('instance') + + for bf in instance.base_finds.all(): + # no other find is associated + if not bf.find.exclude(pk=instance.pk).count(): + bf.delete() + if instance.downstream_treatment: # TODO: not managed for now. Raise an error? return @@ -1118,7 +1124,7 @@ def pre_clean_treatments(sender, **kwargs): post_save.connect(cached_label_changed, sender=Find) -pre_delete.connect(pre_clean_treatments, sender=Find) +pre_delete.connect(pre_clean_find, sender=Find) def base_find_find_changed(sender, **kwargs): diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 933b5f292..b4a798807 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -412,6 +412,20 @@ class FindTest(FindInit, TestCase): self.assertEqual(response.status_code, 200) self.assertIn('class="sheet"', response.content) + def test_delete(self): + self.create_finds(force=True) + first_bf = self.base_finds[0] + self.finds[1].base_finds.add(first_bf) + + self.finds[0].delete() + # on delete the selected base find is not deleted if another find + # is related to it + self.assertEqual(models.BaseFind.objects.filter( + pk=self.base_finds[0].pk).count(), 1) + self.finds[1].delete() + self.assertEqual(models.BaseFind.objects.filter( + pk=self.base_finds[0].pk).count(), 0) + class FindSearchTest(FindInit, TestCase): fixtures = FIND_FIXTURES -- cgit v1.2.3 From 2ad59aa6f6f4506d86c205f78a99ed5e47992156 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 9 Sep 2017 09:11:49 +0200 Subject: v0.99.27 --- CHANGES.md | 14 ++++++++++++++ version.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 16124023a..992cf824c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,20 @@ Ishtar changelog ================ +v0.99.27 (2017-09-09) +--------------------- +### Features ### +- Find deletions: delete associated base find +- Finds: delete associated treatment on find deletion +- Sheet: add a specific sheet_address_section +- Find forms: add discovery date +- Context record form/sheet: add opening/closing dates + +### Bug fixes ### +- Data importer: allow many split for UnicodeFormater +- Year limit is now 1000 +- Fix ParcelField compress method + v0.99.26 (2017-07-26) --------------------- ### Features ### diff --git a/version.py b/version.py index bce04060e..82e78a8ca 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 26) +VERSION = (0, 99, 27) def get_version(): -- cgit v1.2.3