diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-09-02 20:40:23 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-09-02 20:40:23 +0200 |
commit | a9bbac965e33491cfb4f622334fb50bd2c1c529b (patch) | |
tree | 0fdcaf80aa168175feab0f0786a4eec654487f66 | |
parent | af1c007c74a36e04afd5a29b2d7d5c8e82f4e3a3 (diff) | |
download | Ishtar-a9bbac965e33491cfb4f622334fb50bd2c1c529b.tar.bz2 Ishtar-a9bbac965e33491cfb4f622334fb50bd2c1c529b.zip |
Add a "Validate and end" button for modifications (closes #438)
-rw-r--r-- | ishtar/ishtar_base/forms.py | 14 | ||||
-rw-r--r-- | ishtar/ishtar_base/forms_context_records.py | 1 | ||||
-rw-r--r-- | ishtar/ishtar_base/forms_items.py | 5 | ||||
-rw-r--r-- | ishtar/ishtar_base/forms_operations.py | 5 | ||||
-rw-r--r-- | ishtar/locale/fr/LC_MESSAGES/django.po | 739 | ||||
-rw-r--r-- | ishtar/templates/default_wizard.html | 4 |
6 files changed, 396 insertions, 372 deletions
diff --git a/ishtar/ishtar_base/forms.py b/ishtar/ishtar_base/forms.py index 287a181f4..01b1b9dfd 100644 --- a/ishtar/ishtar_base/forms.py +++ b/ishtar/ishtar_base/forms.py @@ -143,8 +143,8 @@ class Wizard(NamedUrlSessionFormWizard): context.update({'previous_steps':previous_steps, 'previous_step_counter':previous_step_counter}) # if modification: show the next steps - next_step = step if self.modification: + next_step = step while next_step: # check if the form is initialized otherwise initialize it if not storage.get_step_data(next_step): @@ -506,13 +506,23 @@ class Wizard(NamedUrlSessionFormWizard): def render_next_step(self, request, storage, form, **kwargs): """ - Manage the modify or delete button in formset: next_step = current_step + Manage: + - modify or delete button in formset: next step = current step + - validate and end: nextstep = last step """ if request.POST.has_key('formset_modify') \ and request.POST['formset_modify'] \ or [key for key in request.POST.keys() if key.endswith('DELETE') and request.POST[key]]: return self.render(request, storage, form, **kwargs) + elif request.POST.has_key('validate_and_end') \ + and request.POST['validate_and_end']: + last_step = self.get_last_step(request, storage) + new_form = self.get_form(request, storage, last_step, + data=storage.get_step_data(last_step), + files=storage.get_step_files(last_step)) + storage.set_current_step(last_step) + return self.render(request, storage, new_form, **kwargs) return super(Wizard, self).render_next_step(request, storage, form, **kwargs) diff --git a/ishtar/ishtar_base/forms_context_records.py b/ishtar/ishtar_base/forms_context_records.py index c62dcb7f7..816782bd8 100644 --- a/ishtar/ishtar_base/forms_context_records.py +++ b/ishtar/ishtar_base/forms_context_records.py @@ -108,6 +108,7 @@ class RecordWizard(Wizard): return form class RecordModifWizard(RecordWizard): + modification = True model = models.ContextRecord class RecordSelect(forms.Form): diff --git a/ishtar/ishtar_base/forms_items.py b/ishtar/ishtar_base/forms_items.py index c6f4b05f4..b763d94b2 100644 --- a/ishtar/ishtar_base/forms_items.py +++ b/ishtar/ishtar_base/forms_items.py @@ -172,7 +172,10 @@ item_search_wizard = SearchWizard([ ('general-item_search', ItemFormSelection)], url_name='item_search',) -item_modification_wizard = ItemWizard([ +class ItemModificationWizard(ItemWizard): + modification = True + +item_modification_wizard = ItemModificationWizard([ ('selec-item_modification', ItemFormSelection), ('item-item_modification', ItemForm), ('dating-item_modification', DateForm), diff --git a/ishtar/ishtar_base/forms_operations.py b/ishtar/ishtar_base/forms_operations.py index 3d149577a..1fefa75f5 100644 --- a/ishtar/ishtar_base/forms_operations.py +++ b/ishtar/ishtar_base/forms_operations.py @@ -449,7 +449,10 @@ operation_creation_wizard = OperationWizard([ }, url_name='operation_creation',) -operation_modification_wizard = OperationWizard([ +class OperationModificationWizard(OperationWizard): + modification = True + +operation_modification_wizard = OperationModificationWizard([ ('selec-operation_modification', OperationFormSelection), ('general-operation_modification', OperationFormGeneral), ('refs-operation_modification', OperationFormReference), diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po index e4009041c..9d5f98569 100644 --- a/ishtar/locale/fr/LC_MESSAGES/django.po +++ b/ishtar/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 13:18+0200\n" +"POT-Creation-Date: 2011-09-02 20:28+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -49,19 +49,19 @@ msgid "New author" msgstr "Nouvel auteur" #: ishtar_base/context_processors.py:42 ishtar_base/menus.py:102 -#: ishtar_base/models.py:789 +#: ishtar_base/models.py:792 msgid "Archaeological file" msgstr "Dossier archéologique" -#: ishtar_base/context_processors.py:43 ishtar_base/menus.py:132 -#: ishtar_base/models.py:927 ishtar_base/models.py:1015 -#: ishtar_base/models.py:1025 ishtar_base/models.py:1132 -#: ishtar_base/models.py:1464 ishtar_base/models.py:1487 +#: ishtar_base/context_processors.py:43 ishtar_base/menus.py:136 +#: ishtar_base/models.py:933 ishtar_base/models.py:1021 +#: ishtar_base/models.py:1031 ishtar_base/models.py:1138 +#: ishtar_base/models.py:1470 ishtar_base/models.py:1493 msgid "Operation" msgstr "Opération" -#: ishtar_base/context_processors.py:44 ishtar_base/menus.py:174 -#: ishtar_base/models.py:1232 templates/sheet_contextrecord.html:104 +#: ishtar_base/context_processors.py:44 ishtar_base/menus.py:178 +#: ishtar_base/models.py:1238 templates/sheet_contextrecord.html:104 #: templates/sheet_operation.html:150 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -82,27 +82,32 @@ msgstr "Confirmation" msgid "There are identical items." msgstr "Il y a des éléments identiques." -#: ishtar_base/forms.py:204 +#: ishtar_base/forms.py:230 msgid "Yes" msgstr "Oui" -#: ishtar_base/forms.py:206 +#: ishtar_base/forms.py:232 msgid "No" msgstr "Non" -#: ishtar_base/forms.py:745 +#: ishtar_base/forms.py:731 ishtar_base/forms.py:732 ishtar_base/models.py:765 +#: ishtar_base/models.py:901 +msgid "Closing date" +msgstr "Date de clotûre" + +#: ishtar_base/forms.py:786 msgid "You should select an item." msgstr "Vous devez sélectionner un élément." -#: ishtar_base/forms.py:746 +#: ishtar_base/forms.py:787 msgid "Add a new item" msgstr "Ajouter un nouvel élément" #: ishtar_base/forms_common.py:43 ishtar_base/forms_common.py:94 #: ishtar_base/forms_common.py:98 ishtar_base/forms_common.py:131 #: ishtar_base/forms_common.py:135 ishtar_base/forms_common.py:379 -#: ishtar_base/forms_operations.py:322 ishtar_base/models.py:593 -#: ishtar_base/models.py:1028 ishtar_base/models.py:1569 +#: ishtar_base/forms_operations.py:323 ishtar_base/models.py:596 +#: ishtar_base/models.py:1034 ishtar_base/models.py:1575 msgid "Town" msgstr "Commune" @@ -126,69 +131,69 @@ msgstr "" #: ishtar_base/forms_common.py:57 ishtar_base/forms_common.py:161 #: ishtar_base/forms_common.py:486 ishtar_base/forms_items.py:191 -#: ishtar_base/menus.py:89 ishtar_base/models.py:647 ishtar_base/models.py:672 -#: ishtar_base/models.py:684 ishtar_base/models.py:1593 -#: ishtar_base/models.py:1626 +#: ishtar_base/menus.py:89 ishtar_base/models.py:650 ishtar_base/models.py:675 +#: ishtar_base/models.py:687 ishtar_base/models.py:1599 +#: ishtar_base/models.py:1632 msgid "Person" msgstr "Individu" #: ishtar_base/forms_common.py:69 ishtar_base/forms_items.py:233 -#: ishtar_base/models.py:1450 ishtar_base/models.py:1524 +#: ishtar_base/models.py:1456 ishtar_base/models.py:1530 msgid "Warehouse" msgstr "Dépôt" #: ishtar_base/forms_common.py:77 ishtar_base/forms_common.py:121 -#: ishtar_base/forms_common.py:173 ishtar_base/models.py:610 -#: ishtar_base/models.py:640 ishtar_base/models.py:1442 -#: ishtar_base/models.py:1555 +#: ishtar_base/forms_common.py:173 ishtar_base/models.py:613 +#: ishtar_base/models.py:643 ishtar_base/models.py:1448 +#: ishtar_base/models.py:1561 msgid "Name" msgstr "Nom" -#: ishtar_base/forms_common.py:79 ishtar_base/models.py:1438 -#: ishtar_base/models.py:1444 +#: ishtar_base/forms_common.py:79 ishtar_base/models.py:1444 +#: ishtar_base/models.py:1450 msgid "Warehouse type" msgstr "Type de dépôt" -#: ishtar_base/forms_common.py:81 ishtar_base/forms_files.py:130 -#: ishtar_base/forms_files.py:162 ishtar_base/models.py:753 -#: ishtar_base/models.py:1446 +#: ishtar_base/forms_common.py:81 ishtar_base/forms_files.py:131 +#: ishtar_base/forms_files.py:163 ishtar_base/models.py:756 +#: ishtar_base/models.py:1452 msgid "Person in charge" msgstr "Responsable" -#: ishtar_base/forms_common.py:86 ishtar_base/forms_files.py:183 -#: ishtar_base/forms_items.py:238 ishtar_base/forms_operations.py:246 -#: ishtar_base/models.py:144 ishtar_base/models.py:785 -#: ishtar_base/models.py:923 ishtar_base/models.py:1447 -#: ishtar_base/models.py:1528 +#: ishtar_base/forms_common.py:86 ishtar_base/forms_files.py:184 +#: ishtar_base/forms_items.py:238 ishtar_base/forms_operations.py:247 +#: ishtar_base/models.py:144 ishtar_base/models.py:788 +#: ishtar_base/models.py:929 ishtar_base/models.py:1453 +#: ishtar_base/models.py:1534 msgid "Comment" msgstr "Commentaire" #: ishtar_base/forms_common.py:88 ishtar_base/forms_common.py:125 -#: ishtar_base/forms_files.py:195 ishtar_base/models.py:588 +#: ishtar_base/forms_files.py:196 ishtar_base/models.py:591 msgid "Address" msgstr "Adresse" #: ishtar_base/forms_common.py:90 ishtar_base/forms_common.py:127 -#: ishtar_base/models.py:589 +#: ishtar_base/models.py:592 msgid "Address complement" msgstr "Complément d'adresse" #: ishtar_base/forms_common.py:92 ishtar_base/forms_common.py:129 -#: ishtar_base/models.py:591 +#: ishtar_base/models.py:594 msgid "Postal code" msgstr "Code postal" #: ishtar_base/forms_common.py:95 ishtar_base/forms_common.py:132 -#: ishtar_base/models.py:594 +#: ishtar_base/models.py:597 msgid "Country" msgstr "Pays" #: ishtar_base/forms_common.py:97 ishtar_base/forms_common.py:134 -#: ishtar_base/models.py:596 +#: ishtar_base/models.py:599 msgid "Phone" msgstr "Téléphone" -#: ishtar_base/forms_common.py:123 ishtar_base/models.py:606 +#: ishtar_base/forms_common.py:123 ishtar_base/models.py:609 msgid "Organization type" msgstr "Type d'organisation" @@ -201,22 +206,22 @@ msgid "Identity" msgstr "Identité" #: ishtar_base/forms_common.py:170 ishtar_base/forms_common.py:443 -#: ishtar_base/models.py:638 ishtar_base/models.py:700 +#: ishtar_base/models.py:641 ishtar_base/models.py:703 #: templates/sheet_contextrecord.html:82 templates/sheet_ope.html:104 #: templates/sheet_ope_modif.html:104 templates/sheet_operation.html:104 msgid "Title" msgstr "Titre" -#: ishtar_base/forms_common.py:171 ishtar_base/models.py:639 +#: ishtar_base/forms_common.py:171 ishtar_base/models.py:642 msgid "Surname" msgstr "Prénom" #: ishtar_base/forms_common.py:175 ishtar_base/forms_common.py:304 -#: ishtar_base/models.py:641 +#: ishtar_base/models.py:644 msgid "Email" msgstr "Courriel" -#: ishtar_base/forms_common.py:177 ishtar_base/models.py:629 +#: ishtar_base/forms_common.py:177 ishtar_base/models.py:632 msgid "Person type" msgstr "Type d'individu" @@ -258,9 +263,9 @@ msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" #: ishtar_base/forms_common.py:361 ishtar_base/forms_common.py:373 -#: ishtar_base/forms_operations.py:320 ishtar_base/forms_operations.py:341 -#: ishtar_base/models.py:763 ishtar_base/models.py:906 -#: ishtar_base/models.py:1570 +#: ishtar_base/forms_operations.py:321 ishtar_base/forms_operations.py:342 +#: ishtar_base/models.py:766 ishtar_base/models.py:912 +#: ishtar_base/models.py:1576 msgid "Towns" msgstr "Communes" @@ -269,27 +274,27 @@ msgid "There are identical towns." msgstr "Il y a des communes identiques." #: ishtar_base/forms_common.py:376 ishtar_base/forms_common.py:425 -#: ishtar_base/forms_operations.py:344 ishtar_base/forms_operations.py:365 -#: ishtar_base/forms_operations.py:369 ishtar_base/models.py:1034 +#: ishtar_base/forms_operations.py:345 ishtar_base/forms_operations.py:366 +#: ishtar_base/forms_operations.py:370 ishtar_base/models.py:1040 msgid "Parcels" msgstr "Parcelles" -#: ishtar_base/forms_common.py:381 ishtar_base/models.py:1029 +#: ishtar_base/forms_common.py:381 ishtar_base/models.py:1035 #: templates/sheet_ope.html:62 templates/sheet_ope_modif.html:62 #: templates/sheet_operation.html:63 msgid "Section" msgstr "Section" -#: ishtar_base/forms_common.py:383 ishtar_base/models.py:1030 +#: ishtar_base/forms_common.py:383 ishtar_base/models.py:1036 msgid "Parcel number" msgstr "Numéro de parcelle" #: ishtar_base/forms_common.py:385 ishtar_base/forms_context_records.py:115 -#: ishtar_base/forms_files.py:135 ishtar_base/forms_files.py:167 -#: ishtar_base/forms_files.py:187 ishtar_base/forms_items.py:142 -#: ishtar_base/forms_operations.py:191 ishtar_base/forms_operations.py:242 -#: ishtar_base/models.py:513 ishtar_base/models.py:746 -#: ishtar_base/models.py:898 ishtar_base/models.py:1026 +#: ishtar_base/forms_files.py:136 ishtar_base/forms_files.py:168 +#: ishtar_base/forms_files.py:188 ishtar_base/forms_items.py:142 +#: ishtar_base/forms_operations.py:192 ishtar_base/forms_operations.py:243 +#: ishtar_base/models.py:516 ishtar_base/models.py:749 +#: ishtar_base/models.py:904 ishtar_base/models.py:1032 #: templates/sheet_file.html:68 templates/sheet_file.html.py:88 #: templates/sheet_file.html:116 templates/sheet_ope.html:61 #: templates/sheet_ope.html.py:83 templates/sheet_ope_modif.html:61 @@ -311,25 +316,25 @@ msgid "Documentation informations" msgstr "Information sur le document" #: ishtar_base/forms_common.py:445 ishtar_base/forms_common.py:464 -#: ishtar_base/models.py:696 +#: ishtar_base/models.py:699 msgid "Source type" msgstr "Type de source" -#: ishtar_base/forms_common.py:447 ishtar_base/models.py:704 +#: ishtar_base/forms_common.py:447 ishtar_base/models.py:707 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: ishtar_base/forms_common.py:448 ishtar_base/models.py:706 +#: ishtar_base/forms_common.py:448 ishtar_base/models.py:709 msgid "Receipt date" msgstr "Date de réception" -#: ishtar_base/forms_common.py:450 ishtar_base/forms_files.py:175 -#: ishtar_base/models.py:708 ishtar_base/models.py:765 +#: ishtar_base/forms_common.py:450 ishtar_base/forms_files.py:176 +#: ishtar_base/models.py:711 ishtar_base/models.py:768 msgid "Creation date" msgstr "Date de création" #: ishtar_base/forms_common.py:461 ishtar_base/forms_common.py:480 -#: ishtar_base/forms_common.py:510 ishtar_base/models.py:688 +#: ishtar_base/forms_common.py:510 ishtar_base/models.py:691 msgid "Author" msgstr "Auteur" @@ -337,8 +342,8 @@ msgstr "Auteur" msgid "Would you like to delete this documentation?" msgstr "Voulez vous supprimer ce document ?" -#: ishtar_base/forms_common.py:487 ishtar_base/models.py:680 -#: ishtar_base/models.py:685 +#: ishtar_base/forms_common.py:487 ishtar_base/models.py:683 +#: ishtar_base/models.py:688 msgid "Author type" msgstr "Type d'auteur" @@ -350,8 +355,8 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: ishtar_base/forms_common.py:520 ishtar_base/models.py:689 -#: ishtar_base/models.py:702 templates/sheet_contextrecord.html:84 +#: ishtar_base/forms_common.py:520 ishtar_base/models.py:692 +#: ishtar_base/models.py:705 templates/sheet_contextrecord.html:84 #: templates/sheet_ope.html:106 templates/sheet_ope_modif.html:106 #: templates/sheet_operation.html:106 msgid "Authors" @@ -363,8 +368,8 @@ msgstr "Opération : " #: ishtar_base/forms_context_records.py:116 #: ishtar_base/forms_context_records.py:212 ishtar_base/forms_items.py:117 -#: ishtar_base/forms_items.py:145 ishtar_base/forms_operations.py:392 -#: ishtar_base/models.py:1074 +#: ishtar_base/forms_items.py:145 ishtar_base/forms_operations.py:393 +#: ishtar_base/models.py:1080 msgid "Period" msgstr "Période" @@ -381,16 +386,16 @@ msgstr "Recherche d'Unité d'Enregistrement" msgid "You should at least select one context record." msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." -#: ishtar_base/forms_context_records.py:146 ishtar_base/forms_files.py:158 -#: ishtar_base/forms_operations.py:216 ishtar_base/forms_operations.py:700 +#: ishtar_base/forms_context_records.py:146 ishtar_base/forms_files.py:159 +#: ishtar_base/forms_operations.py:217 ishtar_base/forms_operations.py:694 #: templates/sheet_file.html:17 templates/sheet_ope.html:5 #: templates/sheet_ope_modif.html:5 templates/sheet_operation.html:5 msgid "General" msgstr "Général" #: ishtar_base/forms_context_records.py:150 -#: ishtar_base/forms_operations.py:346 ishtar_base/models.py:1033 -#: ishtar_base/models.py:1130 ishtar_base/models.py:1425 +#: ishtar_base/forms_operations.py:347 ishtar_base/models.py:1039 +#: ishtar_base/models.py:1136 ishtar_base/models.py:1431 #: templates/sheet_contextrecord.html:109 templates/sheet_ope.html:63 #: templates/sheet_ope.html.py:129 templates/sheet_ope_modif.html:63 #: templates/sheet_ope_modif.html.py:129 templates/sheet_ope_modif.html:157 @@ -400,8 +405,8 @@ msgid "Parcel" msgstr "Parcelle" #: ishtar_base/forms_context_records.py:151 ishtar_base/forms_items.py:99 -#: ishtar_base/forms_items.py:282 ishtar_base/models.py:1134 -#: ishtar_base/models.py:1244 ishtar_base/models.py:1317 +#: ishtar_base/forms_items.py:282 ishtar_base/models.py:1140 +#: ishtar_base/models.py:1250 ishtar_base/models.py:1323 #: templates/sheet_ope.html:125 templates/sheet_ope_modif.html:125 #: templates/sheet_operation.html:124 msgid "ID" @@ -409,8 +414,8 @@ msgstr "Identifiant" #: ishtar_base/forms_context_records.py:153 ishtar_base/forms_items.py:101 #: ishtar_base/forms_items.py:148 ishtar_base/forms_items.py:200 -#: ishtar_base/models.py:1135 ishtar_base/models.py:1245 -#: ishtar_base/models.py:1318 ishtar_base/models.py:1588 +#: ishtar_base/models.py:1141 ishtar_base/models.py:1251 +#: ishtar_base/models.py:1324 ishtar_base/models.py:1594 #: templates/sheet_contextrecord.html:23 #: templates/sheet_contextrecord.html:106 templates/sheet_ope.html:128 #: templates/sheet_ope_modif.html:128 templates/sheet_ope_modif.html.py:154 @@ -418,28 +423,28 @@ msgstr "Identifiant" msgid "Description" msgstr "Description" -#: ishtar_base/forms_context_records.py:155 ishtar_base/models.py:1136 +#: ishtar_base/forms_context_records.py:155 ishtar_base/models.py:1142 msgid "Length (cm)" msgstr "Longueur (cm)" -#: ishtar_base/forms_context_records.py:156 ishtar_base/models.py:1137 +#: ishtar_base/forms_context_records.py:156 ishtar_base/models.py:1143 msgid "Width (cm)" msgstr "Largeur (cm)" -#: ishtar_base/forms_context_records.py:157 ishtar_base/models.py:1138 +#: ishtar_base/forms_context_records.py:157 ishtar_base/models.py:1144 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: ishtar_base/forms_context_records.py:158 ishtar_base/models.py:1139 +#: ishtar_base/forms_context_records.py:158 ishtar_base/models.py:1145 msgid "Depth (cm)" msgstr "Profondeur (cm)" -#: ishtar_base/forms_context_records.py:159 ishtar_base/models.py:1144 +#: ishtar_base/forms_context_records.py:159 ishtar_base/models.py:1150 msgid "Unit" msgstr "Unité" #: ishtar_base/forms_context_records.py:161 ishtar_base/forms_items.py:195 -#: ishtar_base/models.py:1140 ishtar_base/models.py:1591 +#: ishtar_base/models.py:1146 ishtar_base/models.py:1597 msgid "Location" msgstr "Lieu" @@ -449,38 +454,38 @@ msgstr "Cet identifiant existe déjà pour cette opération." #: ishtar_base/forms_context_records.py:207 #: ishtar_base/forms_context_records.py:229 ishtar_base/forms_items.py:112 -#: ishtar_base/models.py:1083 ishtar_base/models.py:1328 +#: ishtar_base/models.py:1089 ishtar_base/models.py:1334 msgid "Dating" msgstr "Datation" #: ishtar_base/forms_context_records.py:214 ishtar_base/forms_items.py:119 -#: ishtar_base/forms_items.py:202 ishtar_base/forms_operations.py:234 -#: ishtar_base/models.py:892 ishtar_base/models.py:1051 -#: ishtar_base/models.py:1075 ishtar_base/models.py:1426 -#: ishtar_base/models.py:1595 ishtar_base/models.py:1627 +#: ishtar_base/forms_items.py:202 ishtar_base/forms_operations.py:235 +#: ishtar_base/models.py:898 ishtar_base/models.py:1057 +#: ishtar_base/models.py:1081 ishtar_base/models.py:1432 +#: ishtar_base/models.py:1601 ishtar_base/models.py:1633 #: templates/sheet_file.html:93 msgid "Start date" msgstr "Date de début" #: ishtar_base/forms_context_records.py:215 ishtar_base/forms_items.py:121 -#: ishtar_base/forms_items.py:204 ishtar_base/models.py:1052 -#: ishtar_base/models.py:1076 ishtar_base/models.py:1427 -#: ishtar_base/models.py:1596 ishtar_base/models.py:1628 +#: ishtar_base/forms_items.py:204 ishtar_base/models.py:1058 +#: ishtar_base/models.py:1082 ishtar_base/models.py:1433 +#: ishtar_base/models.py:1602 ishtar_base/models.py:1634 msgid "End date" msgstr "Date de fin" #: ishtar_base/forms_context_records.py:216 ishtar_base/forms_items.py:122 -#: ishtar_base/models.py:1079 +#: ishtar_base/models.py:1085 msgid "Quality" msgstr "Qualité" #: ishtar_base/forms_context_records.py:218 ishtar_base/forms_items.py:124 -#: ishtar_base/models.py:1065 ishtar_base/models.py:1077 +#: ishtar_base/models.py:1071 ishtar_base/models.py:1083 msgid "Dating type" msgstr "Type de datation" #: ishtar_base/forms_context_records.py:232 -#: ishtar_base/forms_context_records.py:239 ishtar_base/models.py:1149 +#: ishtar_base/forms_context_records.py:239 ishtar_base/models.py:1155 #: templates/sheet_contextrecord.html:32 msgid "Interpretation" msgstr "Interpretation" @@ -489,41 +494,41 @@ msgstr "Interpretation" msgid "Has furniture?" msgstr "A du matériel ?" -#: ishtar_base/forms_context_records.py:237 ishtar_base/models.py:1148 +#: ishtar_base/forms_context_records.py:237 ishtar_base/models.py:1154 msgid "Filling" msgstr "Remplissage" -#: ishtar_base/forms_context_records.py:241 ishtar_base/models.py:1164 +#: ishtar_base/forms_context_records.py:241 ishtar_base/models.py:1170 msgid "Activity" msgstr "Activité" -#: ishtar_base/forms_context_records.py:243 ishtar_base/models.py:1162 +#: ishtar_base/forms_context_records.py:243 ishtar_base/models.py:1168 msgid "Identification" msgstr "Identification" -#: ishtar_base/forms_context_records.py:245 ishtar_base/models.py:1151 +#: ishtar_base/forms_context_records.py:245 ishtar_base/models.py:1157 msgid "TAQ" msgstr "TAQ" -#: ishtar_base/forms_context_records.py:246 ishtar_base/models.py:1154 +#: ishtar_base/forms_context_records.py:246 ishtar_base/models.py:1160 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: ishtar_base/forms_context_records.py:248 ishtar_base/models.py:1156 +#: ishtar_base/forms_context_records.py:248 ishtar_base/models.py:1162 msgid "TPQ" msgstr "TPQ" -#: ishtar_base/forms_context_records.py:249 ishtar_base/models.py:1159 +#: ishtar_base/forms_context_records.py:249 ishtar_base/models.py:1165 msgid "Estimated TPQ" msgstr "TPQ estimé" #: ishtar_base/forms_context_records.py:266 -#: ishtar_base/forms_operations.py:200 ishtar_base/forms_operations.py:581 +#: ishtar_base/forms_operations.py:201 ishtar_base/forms_operations.py:575 msgid "Operation search" msgstr "Recherche d'opérations" #: ishtar_base/forms_context_records.py:268 -#: ishtar_base/forms_operations.py:212 ishtar_base/forms_operations.py:583 +#: ishtar_base/forms_operations.py:213 ishtar_base/forms_operations.py:577 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." @@ -552,103 +557,107 @@ msgid "Unit type of the context record" msgstr "Type d'unité de l'Unité d'Enregistrement" #: ishtar_base/forms_context_records.py:343 ishtar_base/forms_items.py:447 -#: ishtar_base/forms_operations.py:607 +#: ishtar_base/forms_operations.py:601 msgid "Documentation search" msgstr "Recherche de document" #: ishtar_base/forms_context_records.py:345 ishtar_base/forms_items.py:449 -#: ishtar_base/forms_operations.py:609 +#: ishtar_base/forms_operations.py:603 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: ishtar_base/forms_files.py:132 ishtar_base/forms_files.py:177 -#: ishtar_base/models.py:751 +#: ishtar_base/forms_files.py:133 ishtar_base/forms_files.py:178 +#: ishtar_base/models.py:754 msgid "File type" msgstr "Type de dossier" -#: ishtar_base/forms_files.py:134 ishtar_base/forms_files.py:236 +#: ishtar_base/forms_files.py:135 ishtar_base/forms_files.py:237 msgid "Saisine type" msgstr "Type de saisine" -#: ishtar_base/forms_files.py:143 +#: ishtar_base/forms_files.py:144 msgid "Archaeological file search" msgstr "Recherche de dossiers archéologiques" -#: ishtar_base/forms_files.py:154 +#: ishtar_base/forms_files.py:155 msgid "You should select a file." msgstr "Vous devez sélectionner un dossier archéologique." -#: ishtar_base/forms_files.py:171 ishtar_base/forms_files.py:189 -#: ishtar_base/models.py:748 +#: ishtar_base/forms_files.py:172 ishtar_base/forms_files.py:190 +#: ishtar_base/models.py:751 msgid "Numeric reference" msgstr "Référence numérique" -#: ishtar_base/forms_files.py:173 ishtar_base/forms_files.py:191 -#: ishtar_base/models.py:749 +#: ishtar_base/forms_files.py:174 ishtar_base/forms_files.py:192 +#: ishtar_base/models.py:752 msgid "Internal reference" msgstr "Référence interne" -#: ishtar_base/forms_files.py:179 ishtar_base/models.py:769 +#: ishtar_base/forms_files.py:180 ishtar_base/models.py:772 msgid "Related file" msgstr "Dossier en relation avec" -#: ishtar_base/forms_files.py:199 ishtar_base/forms_operations.py:239 -#: ishtar_base/models.py:776 +#: ishtar_base/forms_files.py:200 ishtar_base/forms_operations.py:240 +#: ishtar_base/models.py:779 msgid "Total surface (m²)" msgstr "Surface totale (m²)" -#: ishtar_base/forms_files.py:202 ishtar_base/models.py:780 +#: ishtar_base/forms_files.py:203 ishtar_base/models.py:783 msgid "Main address" msgstr "Adresse principale" -#: ishtar_base/forms_files.py:203 ishtar_base/models.py:781 +#: ishtar_base/forms_files.py:204 ishtar_base/models.py:784 msgid "Main address - complement" msgstr "Adresse principale - complément" -#: ishtar_base/forms_files.py:205 ishtar_base/models.py:783 +#: ishtar_base/forms_files.py:206 ishtar_base/models.py:786 msgid "Main address - postal code" msgstr "Adresse principale - code postal" -#: ishtar_base/forms_files.py:209 +#: ishtar_base/forms_files.py:210 msgid "Preventive informations" msgstr "Information archéologie préventive" -#: ishtar_base/forms_files.py:214 ishtar_base/models.py:755 +#: ishtar_base/forms_files.py:215 ishtar_base/models.py:758 msgid "General contractor" msgstr "Aménageur" -#: ishtar_base/forms_files.py:221 ishtar_base/models.py:757 +#: ishtar_base/forms_files.py:222 ishtar_base/models.py:760 msgid "Town planning service" msgstr "Service instructeur" -#: ishtar_base/forms_files.py:227 ishtar_base/models.py:733 -#: ishtar_base/models.py:758 +#: ishtar_base/forms_files.py:228 ishtar_base/models.py:736 +#: ishtar_base/models.py:761 msgid "Permit type" msgstr "Type de permis" -#: ishtar_base/forms_files.py:229 ishtar_base/models.py:760 +#: ishtar_base/forms_files.py:230 ishtar_base/models.py:763 msgid "Permit reference" msgstr "Référence du permis" -#: ishtar_base/forms_files.py:232 ishtar_base/models.py:779 +#: ishtar_base/forms_files.py:233 ishtar_base/models.py:782 msgid "Total developed surface (m²)" msgstr "Surface totale aménagée (m²)" -#: ishtar_base/forms_files.py:238 ishtar_base/models.py:767 +#: ishtar_base/forms_files.py:239 ishtar_base/models.py:770 msgid "Reception date" msgstr "Date de réception" -#: ishtar_base/forms_files.py:288 templates/sheet_file.html:86 +#: ishtar_base/forms_files.py:291 +msgid "Would you like to close this archaeological file?" +msgstr "Voulez vous clôturer ce dossier archéologique ?" + +#: ishtar_base/forms_files.py:302 templates/sheet_file.html:86 msgid "Associated operations" msgstr "Opérations associées" -#: ishtar_base/forms_files.py:307 +#: ishtar_base/forms_files.py:321 msgid "Would you like to delete this archaelogical file ?" msgstr "Voulez vous supprimer ce dossier archéologique ?" -#: ishtar_base/forms_files.py:332 ishtar_base/forms_files.py:349 -#: ishtar_base/forms_operations.py:673 ishtar_base/forms_operations.py:703 -#: ishtar_base/models.py:1469 ishtar_base/models.py:1477 +#: ishtar_base/forms_files.py:339 ishtar_base/forms_files.py:356 +#: ishtar_base/forms_operations.py:667 ishtar_base/forms_operations.py:697 +#: ishtar_base/models.py:1475 ishtar_base/models.py:1483 msgid "Act type" msgstr "Type d'acte" @@ -656,36 +665,36 @@ msgstr "Type d'acte" msgid "Current context record: " msgstr "Unité d'Enregistrement : " -#: ishtar_base/forms_items.py:96 ishtar_base/menus.py:193 -#: ishtar_base/models.py:1386 ishtar_base/models.py:1420 -#: ishtar_base/models.py:1623 +#: ishtar_base/forms_items.py:96 ishtar_base/menus.py:197 +#: ishtar_base/models.py:1392 ishtar_base/models.py:1426 +#: ishtar_base/models.py:1629 msgid "Item" msgstr "Mobilier" #: ishtar_base/forms_items.py:103 ishtar_base/forms_items.py:149 -#: ishtar_base/models.py:1248 +#: ishtar_base/models.py:1254 msgid "Is isolated?" msgstr "Est isolé ?" #: ishtar_base/forms_items.py:105 ishtar_base/forms_items.py:147 -#: ishtar_base/forms_items.py:286 ishtar_base/models.py:1240 -#: ishtar_base/models.py:1320 templates/sheet_contextrecord.html:103 +#: ishtar_base/forms_items.py:286 ishtar_base/models.py:1246 +#: ishtar_base/models.py:1326 templates/sheet_contextrecord.html:103 #: templates/sheet_operation.html:149 msgid "Material type" msgstr "Type de matériau" #: ishtar_base/forms_items.py:107 ishtar_base/forms_items.py:288 -#: ishtar_base/models.py:1321 ishtar_base/models.py:1515 +#: ishtar_base/models.py:1327 ishtar_base/models.py:1521 msgid "Volume (l)" msgstr "Volume (l)" #: ishtar_base/forms_items.py:108 ishtar_base/forms_items.py:289 -#: ishtar_base/models.py:1322 +#: ishtar_base/models.py:1328 msgid "Weight (g)" msgstr "Poids (g)" #: ishtar_base/forms_items.py:109 ishtar_base/forms_items.py:290 -#: ishtar_base/models.py:1323 +#: ishtar_base/models.py:1329 msgid "Item number" msgstr "Nombre d'éléments" @@ -701,8 +710,8 @@ msgstr "Recherche de mobilier" msgid "Base treatment" msgstr "Traitement de base" -#: ishtar_base/forms_items.py:190 ishtar_base/models.py:1582 -#: ishtar_base/models.py:1590 +#: ishtar_base/forms_items.py:190 ishtar_base/models.py:1588 +#: ishtar_base/models.py:1596 msgid "Treatment type" msgstr "Type de traitement" @@ -710,7 +719,7 @@ msgstr "Type de traitement" msgid "Upstream items" msgstr "Mobilier amont" -#: ishtar_base/forms_items.py:217 ishtar_base/models.py:1387 +#: ishtar_base/forms_items.py:217 ishtar_base/models.py:1393 msgid "Items" msgstr "Mobiliers" @@ -718,13 +727,13 @@ msgstr "Mobiliers" msgid "You should at least select one archaeological item." msgstr "Vous devez sélectionner du mobilier archéologique." -#: ishtar_base/forms_items.py:230 ishtar_base/models.py:1329 -#: ishtar_base/models.py:1531 ishtar_base/models.py:1586 +#: ishtar_base/forms_items.py:230 ishtar_base/models.py:1335 +#: ishtar_base/models.py:1537 ishtar_base/models.py:1592 msgid "Container" msgstr "Contenant" #: ishtar_base/forms_items.py:231 ishtar_base/forms_items.py:355 -#: ishtar_base/models.py:1516 ishtar_base/models.py:1527 +#: ishtar_base/models.py:1522 ishtar_base/models.py:1533 #: templates/sheet_file.html:69 templates/sheet_file.html.py:89 #: templates/sheet_file.html:117 templates/sheet_ope.html:84 #: templates/sheet_ope_modif.html:84 templates/sheet_operation.html:84 @@ -732,7 +741,7 @@ msgid "Reference" msgstr "Référence" #: ishtar_base/forms_items.py:232 ishtar_base/forms_items.py:354 -#: ishtar_base/models.py:1519 ishtar_base/models.py:1526 +#: ishtar_base/models.py:1525 ishtar_base/models.py:1532 msgid "Container type" msgstr "Type de contenant" @@ -764,7 +773,7 @@ msgstr "Vous devez sélectionner un conteneur." msgid "Add a new container" msgstr "Ajouter un nouveau conteneur." -#: ishtar_base/forms_items.py:371 ishtar_base/menus.py:207 +#: ishtar_base/forms_items.py:371 ishtar_base/menus.py:211 msgid "Packaging" msgstr "Conditionnement" @@ -802,7 +811,7 @@ msgstr "Type de matériau du mobilier" msgid "Description of the archaelogical item" msgstr "Description du mobilier" -#: ishtar_base/forms_operations.py:180 +#: ishtar_base/forms_operations.py:181 msgid "" "Warning: No Archaelogical File is provided. If you have forget it return to " "the first step." @@ -810,55 +819,55 @@ msgstr "" "Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un " "oubli, définissez le à la première étape." -#: ishtar_base/forms_operations.py:187 ishtar_base/forms_operations.py:232 -#: ishtar_base/forms_operations.py:594 ishtar_base/models.py:872 -#: ishtar_base/models.py:903 +#: ishtar_base/forms_operations.py:188 ishtar_base/forms_operations.py:233 +#: ishtar_base/forms_operations.py:588 ishtar_base/models.py:878 +#: ishtar_base/models.py:909 msgid "Operation type" msgstr "Type d'opération" -#: ishtar_base/forms_operations.py:189 ishtar_base/models.py:905 +#: ishtar_base/forms_operations.py:190 ishtar_base/models.py:911 msgid "Remains" msgstr "Vestiges" -#: ishtar_base/forms_operations.py:192 +#: ishtar_base/forms_operations.py:193 msgid "Is open?" msgstr "Est ouvert ?" -#: ishtar_base/forms_operations.py:221 ishtar_base/models.py:1479 +#: ishtar_base/forms_operations.py:222 ishtar_base/models.py:1485 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: ishtar_base/forms_operations.py:228 ishtar_base/models.py:1463 -#: ishtar_base/models.py:1489 +#: ishtar_base/forms_operations.py:229 ishtar_base/models.py:1469 +#: ishtar_base/models.py:1495 msgid "Archaelogical file" msgstr "Dossier archéologique" -#: ishtar_base/forms_operations.py:236 ishtar_base/models.py:893 +#: ishtar_base/forms_operations.py:237 ishtar_base/models.py:899 #: templates/sheet_file.html:94 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: ishtar_base/forms_operations.py:260 +#: ishtar_base/forms_operations.py:261 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" "Avant de renseigner la date de fin de chantier, il est nécessaire de " "renseigner une date de début." -#: ishtar_base/forms_operations.py:264 +#: ishtar_base/forms_operations.py:265 msgid "The excavation end date cannot be before the start date." msgstr "La date de fin de chantier ne peut être avant la date de début." -#: ishtar_base/forms_operations.py:269 +#: ishtar_base/forms_operations.py:270 msgid "References" msgstr "Référence" -#: ishtar_base/forms_operations.py:276 ishtar_base/models.py:899 -#: ishtar_base/models.py:957 +#: ishtar_base/forms_operations.py:277 ishtar_base/models.py:905 +#: ishtar_base/models.py:963 msgid "Operation code" msgstr "Code de l'opération" -#: ishtar_base/forms_operations.py:295 +#: ishtar_base/forms_operations.py:296 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -867,71 +876,66 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: ishtar_base/forms_operations.py:301 +#: ishtar_base/forms_operations.py:302 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: ishtar_base/forms_operations.py:302 ishtar_base/models.py:907 +#: ishtar_base/forms_operations.py:303 ishtar_base/models.py:913 msgid "Cost (€)" msgstr "Cout (€)" -#: ishtar_base/forms_operations.py:310 +#: ishtar_base/forms_operations.py:311 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: ishtar_base/forms_operations.py:313 ishtar_base/models.py:918 +#: ishtar_base/forms_operations.py:314 ishtar_base/models.py:924 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: ishtar_base/forms_operations.py:315 ishtar_base/models.py:920 +#: ishtar_base/forms_operations.py:316 ishtar_base/models.py:926 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: ishtar_base/forms_operations.py:317 ishtar_base/models.py:922 +#: ishtar_base/forms_operations.py:318 ishtar_base/models.py:928 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: ishtar_base/forms_operations.py:372 ishtar_base/forms_operations.py:386 -#: ishtar_base/models.py:887 +#: ishtar_base/forms_operations.py:373 ishtar_base/forms_operations.py:387 +#: ishtar_base/models.py:893 msgid "Remain types" msgstr "Types de vestige" -#: ishtar_base/forms_operations.py:375 ishtar_base/models.py:886 +#: ishtar_base/forms_operations.py:376 ishtar_base/models.py:892 msgid "Remain type" msgstr "Type de vestige" -#: ishtar_base/forms_operations.py:382 +#: ishtar_base/forms_operations.py:383 msgid "There are identical remain types" msgstr "Il y a des types de vestige identiques." -#: ishtar_base/forms_operations.py:389 ishtar_base/forms_operations.py:403 -#: ishtar_base/models.py:908 templates/sheet_contextrecord.html:105 +#: ishtar_base/forms_operations.py:390 ishtar_base/forms_operations.py:404 +#: ishtar_base/models.py:914 templates/sheet_contextrecord.html:105 #: templates/sheet_ope_modif.html:153 templates/sheet_operation.html:151 msgid "Periods" msgstr "Périodes" -#: ishtar_base/forms_operations.py:399 +#: ishtar_base/forms_operations.py:400 msgid "There are identical periods" msgstr "Il y a des périodes identiques." -#: ishtar_base/forms_operations.py:483 ishtar_base/forms_operations.py:484 -#: ishtar_base/models.py:895 -msgid "Closing date" -msgstr "Date de clotûre" - -#: ishtar_base/forms_operations.py:494 +#: ishtar_base/forms_operations.py:490 msgid "Would you like to close this operation?" msgstr "Voulez vous clôturer cette opération ?" -#: ishtar_base/forms_operations.py:508 +#: ishtar_base/forms_operations.py:504 msgid "Would you like to delete this operation?" msgstr "Voulez vous supprimer cette opération ?" -#: ishtar_base/forms_operations.py:552 ishtar_base/models.py:1017 +#: ishtar_base/forms_operations.py:546 ishtar_base/models.py:1023 msgid "Index" msgstr "Index" -#: ishtar_base/forms_operations.py:575 +#: ishtar_base/forms_operations.py:569 #, python-format msgid "" "Index already exist for operation: %(operation)s - use a value bigger than " @@ -940,35 +944,35 @@ msgstr "" "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur " "plus grande que %(last_val)d" -#: ishtar_base/forms_operations.py:593 +#: ishtar_base/forms_operations.py:587 msgid "Operation's town" msgstr "Commune de l'opération" -#: ishtar_base/forms_operations.py:596 +#: ishtar_base/forms_operations.py:590 msgid "Operation's year" msgstr "Année de l'opération" -#: ishtar_base/forms_operations.py:683 +#: ishtar_base/forms_operations.py:677 msgid "Administrative act search" msgstr "Recherche d'actes administratifs" -#: ishtar_base/forms_operations.py:695 +#: ishtar_base/forms_operations.py:689 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: ishtar_base/forms_operations.py:704 ishtar_base/models.py:1485 +#: ishtar_base/forms_operations.py:698 ishtar_base/models.py:1491 msgid "Signatory" msgstr "Signataire" -#: ishtar_base/forms_operations.py:708 ishtar_base/models.py:1491 +#: ishtar_base/forms_operations.py:702 ishtar_base/models.py:1497 msgid "Object" msgstr "Objet" -#: ishtar_base/forms_operations.py:710 ishtar_base/models.py:1490 +#: ishtar_base/forms_operations.py:704 ishtar_base/models.py:1496 msgid "Signature date" msgstr "Date de signature" -#: ishtar_base/forms_operations.py:737 +#: ishtar_base/forms_operations.py:731 msgid "Would you like to delete this administrative act?" msgstr "Voulez vous supprimer cet acte administratif ?" @@ -976,14 +980,14 @@ msgstr "Voulez vous supprimer cet acte administratif ?" msgid "Administration" msgstr "Administration" -#: ishtar_base/menus.py:91 ishtar_base/menus.py:107 ishtar_base/menus.py:138 -#: ishtar_base/menus.py:180 ishtar_base/menus.py:199 +#: ishtar_base/menus.py:91 ishtar_base/menus.py:107 ishtar_base/menus.py:142 +#: ishtar_base/menus.py:184 ishtar_base/menus.py:203 msgid "Creation" msgstr "Création" -#: ishtar_base/menus.py:94 ishtar_base/menus.py:110 ishtar_base/menus.py:123 -#: ishtar_base/menus.py:142 ishtar_base/menus.py:163 ishtar_base/menus.py:184 -#: ishtar_base/menus.py:203 +#: ishtar_base/menus.py:94 ishtar_base/menus.py:110 ishtar_base/menus.py:127 +#: ishtar_base/menus.py:146 ishtar_base/menus.py:167 ishtar_base/menus.py:188 +#: ishtar_base/menus.py:207 msgid "Modification" msgstr "Modification" @@ -991,60 +995,60 @@ msgstr "Modification" msgid "Account management" msgstr "Gestion des comptes" -#: ishtar_base/menus.py:104 ishtar_base/menus.py:134 ishtar_base/menus.py:176 -#: ishtar_base/menus.py:195 ishtar_base/widgets.py:213 +#: ishtar_base/menus.py:104 ishtar_base/menus.py:138 ishtar_base/menus.py:180 +#: ishtar_base/menus.py:199 ishtar_base/widgets.py:213 msgid "Search" msgstr "Recherche" -#: ishtar_base/menus.py:113 ishtar_base/menus.py:127 ishtar_base/menus.py:150 -#: ishtar_base/menus.py:168 ishtar_base/menus.py:188 ishtar_base/menus.py:253 +#: ishtar_base/menus.py:113 ishtar_base/menus.py:150 +msgid "Closing" +msgstr "Clotûre" + +#: ishtar_base/menus.py:117 ishtar_base/menus.py:131 ishtar_base/menus.py:154 +#: ishtar_base/menus.py:172 ishtar_base/menus.py:192 ishtar_base/menus.py:257 msgid "Deletion" msgstr "Suppression" -#: ishtar_base/menus.py:116 ishtar_base/menus.py:155 -#: ishtar_base/models.py:1497 ishtar_base/models.py:1625 +#: ishtar_base/menus.py:120 ishtar_base/menus.py:159 +#: ishtar_base/models.py:1503 ishtar_base/models.py:1631 msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_base/menus.py:119 ishtar_base/menus.py:158 ishtar_base/menus.py:217 +#: ishtar_base/menus.py:123 ishtar_base/menus.py:162 ishtar_base/menus.py:221 #: ishtar_base/widgets.py:268 templates/window.html:37 msgid "Add" msgstr "Ajout" -#: ishtar_base/menus.py:146 -msgid "Closing" -msgstr "Clotûre" - -#: ishtar_base/menus.py:215 templates/sheet_ope.html:100 +#: ishtar_base/menus.py:219 templates/sheet_ope.html:100 #: templates/sheet_ope_modif.html:100 msgid "Documentation" msgstr "Documentation" -#: ishtar_base/menus.py:220 ishtar_base/menus.py:238 ishtar_base/menus.py:256 +#: ishtar_base/menus.py:224 ishtar_base/menus.py:242 ishtar_base/menus.py:260 msgid "Related to an operation" msgstr "Associé à une operation" -#: ishtar_base/menus.py:225 ishtar_base/menus.py:243 ishtar_base/menus.py:261 +#: ishtar_base/menus.py:229 ishtar_base/menus.py:247 ishtar_base/menus.py:265 msgid "Related to a context record" msgstr "Associé à une Unité d'Enregistrement" -#: ishtar_base/menus.py:230 ishtar_base/menus.py:248 ishtar_base/menus.py:266 +#: ishtar_base/menus.py:234 ishtar_base/menus.py:252 ishtar_base/menus.py:270 msgid "Related to an archaelogical item" msgstr "Associé à du mobilier" -#: ishtar_base/menus.py:235 +#: ishtar_base/menus.py:239 msgid "Modify" msgstr "Modifier" -#: ishtar_base/menus.py:284 +#: ishtar_base/menus.py:288 msgid "Dashboard" msgstr "Tableau de bord" -#: ishtar_base/menus.py:286 +#: ishtar_base/menus.py:290 msgid "General informations" msgstr "Informations générales" -#: ishtar_base/menus.py:289 ishtar_base/models.py:790 ishtar_base/views.py:656 +#: ishtar_base/menus.py:293 ishtar_base/models.py:793 ishtar_base/views.py:655 #: templates/dashboard_file.html:9 msgid "Archaeological files" msgstr "Dossiers archéologiques" @@ -1061,7 +1065,7 @@ msgstr "Un élément sélectionné n'est pas valide." msgid "This item already exist." msgstr "Cet élément existe déjà." -#: ishtar_base/models.py:141 ishtar_base/models.py:576 +#: ishtar_base/models.py:141 ishtar_base/models.py:579 msgid "Label" msgstr "Libellé" @@ -1077,29 +1081,29 @@ msgstr "Disponible" msgid "Last editor" msgstr "Dernier éditeur" -#: ishtar_base/models.py:516 ishtar_base/models.py:577 +#: ishtar_base/models.py:519 ishtar_base/models.py:580 #: templates/dashboard_main.html:72 msgid "Number" msgstr "Nombre" -#: ishtar_base/models.py:580 +#: ishtar_base/models.py:583 msgid "Departement" msgstr "Département" -#: ishtar_base/models.py:581 +#: ishtar_base/models.py:584 msgid "Departements" msgstr "Départements" -#: ishtar_base/models.py:597 +#: ishtar_base/models.py:600 msgid "Mobile phone" msgstr "Téléphone portable" -#: ishtar_base/models.py:607 +#: ishtar_base/models.py:610 msgid "Organization types" msgstr "Types d'organisation" -#: ishtar_base/models.py:612 ishtar_base/models.py:642 -#: ishtar_base/models.py:701 templates/sheet_contextrecord.html:83 +#: ishtar_base/models.py:615 ishtar_base/models.py:645 +#: ishtar_base/models.py:704 templates/sheet_contextrecord.html:83 #: templates/sheet_file.html:70 templates/sheet_file.html.py:91 #: templates/sheet_file.html:118 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 @@ -1109,258 +1113,254 @@ msgstr "Types d'organisation" msgid "Type" msgstr "Type" -#: ishtar_base/models.py:615 +#: ishtar_base/models.py:618 msgid "Organization" msgstr "Organisation" -#: ishtar_base/models.py:616 +#: ishtar_base/models.py:619 msgid "Organizations" msgstr "Organisations" -#: ishtar_base/models.py:618 +#: ishtar_base/models.py:621 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: ishtar_base/models.py:619 +#: ishtar_base/models.py:622 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: ishtar_base/models.py:620 +#: ishtar_base/models.py:623 msgid "Can change own Organization" msgstr "Peut changer sa propre Organisation" -#: ishtar_base/models.py:621 +#: ishtar_base/models.py:624 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: ishtar_base/models.py:630 +#: ishtar_base/models.py:633 msgid "Person types" msgstr "Types d'individu" -#: ishtar_base/models.py:633 +#: ishtar_base/models.py:636 msgid "Mr" msgstr "M" -#: ishtar_base/models.py:634 +#: ishtar_base/models.py:637 msgid "Miss" msgstr "Mlle" -#: ishtar_base/models.py:635 +#: ishtar_base/models.py:638 msgid "Mrs" msgstr "Mme" -#: ishtar_base/models.py:636 +#: ishtar_base/models.py:639 msgid "Doctor" msgstr "Dr" -#: ishtar_base/models.py:644 +#: ishtar_base/models.py:647 msgid "Is attached to" msgstr "Est rattaché à" -#: ishtar_base/models.py:648 +#: ishtar_base/models.py:651 msgid "Persons" msgstr "Individus" -#: ishtar_base/models.py:650 +#: ishtar_base/models.py:653 msgid "Can view Person" msgstr "Peut voir les Personnes" -#: ishtar_base/models.py:651 +#: ishtar_base/models.py:654 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: ishtar_base/models.py:652 +#: ishtar_base/models.py:655 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: ishtar_base/models.py:653 +#: ishtar_base/models.py:656 msgid "Can change own Person" msgstr "Peut changer sa propre Personne" -#: ishtar_base/models.py:654 +#: ishtar_base/models.py:657 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: ishtar_base/models.py:675 +#: ishtar_base/models.py:678 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: ishtar_base/models.py:676 +#: ishtar_base/models.py:679 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: ishtar_base/models.py:681 +#: ishtar_base/models.py:684 msgid "Author types" msgstr "Types d'auteur" -#: ishtar_base/models.py:697 +#: ishtar_base/models.py:700 msgid "Source types" msgstr "Types de source" -#: ishtar_base/models.py:719 +#: ishtar_base/models.py:722 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: ishtar_base/models.py:720 +#: ishtar_base/models.py:723 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: ishtar_base/models.py:734 +#: ishtar_base/models.py:737 msgid "Permit types" msgstr "Types de permis" -#: ishtar_base/models.py:738 +#: ishtar_base/models.py:741 msgid "Delay (in days)" msgstr "Delai (en jours)" -#: ishtar_base/models.py:762 -msgid "Is active?" -msgstr "Est actif ?" - -#: ishtar_base/models.py:774 +#: ishtar_base/models.py:777 msgid "Reference number" msgstr "Référence" -#: ishtar_base/models.py:792 +#: ishtar_base/models.py:795 msgid "Can view own Archaelogical file" msgstr "Peut voir son propre Dossier archéologique" -#: ishtar_base/models.py:793 +#: ishtar_base/models.py:796 msgid "Can add own Archaelogical file" msgstr "Peut ajouter son propre Dossier archéologique" -#: ishtar_base/models.py:794 +#: ishtar_base/models.py:797 msgid "Can change own Archaelogical file" msgstr "Peut changer son propre Dossier archéologique" -#: ishtar_base/models.py:795 +#: ishtar_base/models.py:798 msgid "Can delete own Archaelogical file" msgstr "Peut supprimer son propre Dossier archéologique" -#: ishtar_base/models.py:813 ishtar_base/models.py:937 +#: ishtar_base/models.py:816 ishtar_base/models.py:943 msgid "Intercommunal" msgstr "Intercommunal" -#: ishtar_base/models.py:863 ishtar_base/models.py:901 -#: ishtar_base/models.py:1023 +#: ishtar_base/models.py:869 ishtar_base/models.py:907 +#: ishtar_base/models.py:1029 msgid "File" msgstr "Dossier" -#: ishtar_base/models.py:864 +#: ishtar_base/models.py:870 msgid "Department" msgstr "Département" -#: ishtar_base/models.py:873 +#: ishtar_base/models.py:879 msgid "Operation types" msgstr "Types d'opération" -#: ishtar_base/models.py:897 templates/sheet_file.html:92 +#: ishtar_base/models.py:903 templates/sheet_file.html:92 msgid "In charge" msgstr "Responsable" -#: ishtar_base/models.py:904 ishtar_base/models.py:1556 +#: ishtar_base/models.py:910 ishtar_base/models.py:1562 msgid "Surface (m²)" msgstr "Area (m²)" -#: ishtar_base/models.py:928 ishtar_base/views.py:657 +#: ishtar_base/models.py:934 ishtar_base/views.py:656 msgid "Operations" msgstr "Opérations" -#: ishtar_base/models.py:930 +#: ishtar_base/models.py:936 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: ishtar_base/models.py:931 +#: ishtar_base/models.py:937 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: ishtar_base/models.py:932 +#: ishtar_base/models.py:938 msgid "Can change own Operation" msgstr "Peut changer sa propre Opération" -#: ishtar_base/models.py:933 +#: ishtar_base/models.py:939 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: ishtar_base/models.py:970 +#: ishtar_base/models.py:976 msgid "This operation code already exists for this year" msgstr "Cet code d'opération existe déjà pour cette année." -#: ishtar_base/models.py:1013 +#: ishtar_base/models.py:1019 msgid "Operation documentation" msgstr "Documentation d'une opération" -#: ishtar_base/models.py:1014 +#: ishtar_base/models.py:1020 msgid "Operation documentations" msgstr "Documentations des opérations" -#: ishtar_base/models.py:1050 ishtar_base/models.py:1094 -#: ishtar_base/models.py:1106 ishtar_base/models.py:1116 -#: ishtar_base/models.py:1316 +#: ishtar_base/models.py:1056 ishtar_base/models.py:1100 +#: ishtar_base/models.py:1112 ishtar_base/models.py:1122 +#: ishtar_base/models.py:1322 msgid "Order" msgstr "Ordre" -#: ishtar_base/models.py:1053 +#: ishtar_base/models.py:1059 msgid "Parent period" msgstr "Période parente" -#: ishtar_base/models.py:1057 +#: ishtar_base/models.py:1063 msgid "Type Period" msgstr "Type de période" -#: ishtar_base/models.py:1058 +#: ishtar_base/models.py:1064 msgid "Types Period" msgstr "Types de période" -#: ishtar_base/models.py:1066 +#: ishtar_base/models.py:1072 msgid "Dating types" msgstr "Types de datation" -#: ishtar_base/models.py:1070 +#: ishtar_base/models.py:1076 msgid "Dating quality" msgstr "Qualité de datation" -#: ishtar_base/models.py:1071 +#: ishtar_base/models.py:1077 msgid "Dating qualities" msgstr "Qualités de datation" -#: ishtar_base/models.py:1084 +#: ishtar_base/models.py:1090 msgid "Datings" msgstr "Datations" -#: ishtar_base/models.py:1095 +#: ishtar_base/models.py:1101 msgid "Parent unit" msgstr "Unité parente" -#: ishtar_base/models.py:1099 +#: ishtar_base/models.py:1105 msgid "Type Unit" msgstr "Type d'unité" -#: ishtar_base/models.py:1100 +#: ishtar_base/models.py:1106 msgid "Types Unit" msgstr "Types d'unité" -#: ishtar_base/models.py:1109 +#: ishtar_base/models.py:1115 msgid "Type Activity" msgstr "Type d'activité" -#: ishtar_base/models.py:1110 +#: ishtar_base/models.py:1116 msgid "Types Activity" msgstr "Types d'activités" -#: ishtar_base/models.py:1118 +#: ishtar_base/models.py:1124 msgid "Type Identification" msgstr "Type d'identification" -#: ishtar_base/models.py:1119 +#: ishtar_base/models.py:1125 msgid "Types Identification" msgstr "Types d'identification" -#: ishtar_base/models.py:1142 +#: ishtar_base/models.py:1148 msgid "A short description of the location of the context record" msgstr "Une courte description de la situation de l'Unité d'Enregistrement" -#: ishtar_base/models.py:1152 +#: ishtar_base/models.py:1158 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -1368,11 +1368,11 @@ msgstr "" "« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été crée après " "cette date" -#: ishtar_base/models.py:1155 +#: ishtar_base/models.py:1161 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: ishtar_base/models.py:1157 +#: ishtar_base/models.py:1163 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -1380,258 +1380,258 @@ msgstr "" "« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été crée avant " "cette date" -#: ishtar_base/models.py:1160 +#: ishtar_base/models.py:1166 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: ishtar_base/models.py:1168 ishtar_base/models.py:1169 -#: ishtar_base/models.py:1247 templates/sheet_contextrecord.html:6 +#: ishtar_base/models.py:1174 ishtar_base/models.py:1175 +#: ishtar_base/models.py:1253 templates/sheet_contextrecord.html:6 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: ishtar_base/models.py:1171 +#: ishtar_base/models.py:1177 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: ishtar_base/models.py:1172 +#: ishtar_base/models.py:1178 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: ishtar_base/models.py:1173 +#: ishtar_base/models.py:1179 msgid "Can change own Context Record" msgstr "Peut changer sa propre Unité d'Enregistrement" -#: ishtar_base/models.py:1174 +#: ishtar_base/models.py:1180 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: ishtar_base/models.py:1229 +#: ishtar_base/models.py:1235 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: ishtar_base/models.py:1230 +#: ishtar_base/models.py:1236 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" -#: ishtar_base/models.py:1235 +#: ishtar_base/models.py:1241 msgid "Recommendation" msgstr "Recommendation" -#: ishtar_base/models.py:1237 +#: ishtar_base/models.py:1243 msgid "Parent material" msgstr "Matériau parent" -#: ishtar_base/models.py:1241 +#: ishtar_base/models.py:1247 msgid "Material types" msgstr "Types de matériaux" -#: ishtar_base/models.py:1255 ishtar_base/models.py:1314 +#: ishtar_base/models.py:1261 ishtar_base/models.py:1320 msgid "Base item" msgstr "Mobilier de base" -#: ishtar_base/models.py:1256 +#: ishtar_base/models.py:1262 msgid "Base items" msgstr "Mobiliers de base" -#: ishtar_base/models.py:1258 +#: ishtar_base/models.py:1264 msgid "Can view own Base item" msgstr "Peut voir son propre Mobilier de base" -#: ishtar_base/models.py:1259 +#: ishtar_base/models.py:1265 msgid "Can add own Base item" msgstr "Peut ajouter son propre Mobilier de base" -#: ishtar_base/models.py:1260 +#: ishtar_base/models.py:1266 msgid "Can change own Base item" msgstr "Peut changer son propre Mobilier de base" -#: ishtar_base/models.py:1261 +#: ishtar_base/models.py:1267 msgid "Can delete own Base item" msgstr "Peut supprimer son propre Mobilier de base" -#: ishtar_base/models.py:1325 +#: ishtar_base/models.py:1331 msgid "Upstream treatment" msgstr "Traitement amont" -#: ishtar_base/models.py:1327 +#: ishtar_base/models.py:1333 msgid "Downstream treatment" msgstr "Traitement aval" -#: ishtar_base/models.py:1389 +#: ishtar_base/models.py:1395 msgid "Can view own Item" msgstr "Peut voir son propre Mobilier" -#: ishtar_base/models.py:1390 +#: ishtar_base/models.py:1396 msgid "Can add own Item" msgstr "Peut ajouter son propre Mobilier" -#: ishtar_base/models.py:1391 +#: ishtar_base/models.py:1397 msgid "Can change own Item" msgstr "Peut changer son propre Mobilier" -#: ishtar_base/models.py:1392 +#: ishtar_base/models.py:1398 msgid "Can delete own Item" msgstr "Peut supprimer son propre Mobilier" -#: ishtar_base/models.py:1418 +#: ishtar_base/models.py:1424 msgid "Item documentation" msgstr "Documentation du mobilier" -#: ishtar_base/models.py:1419 +#: ishtar_base/models.py:1425 msgid "Item documentations" msgstr "Documentations des mobiliers" -#: ishtar_base/models.py:1424 templates/sheet_ope.html:64 +#: ishtar_base/models.py:1430 templates/sheet_ope.html:64 #: templates/sheet_ope_modif.html:64 msgid "Owner" msgstr "Propriétaire" -#: ishtar_base/models.py:1430 +#: ishtar_base/models.py:1436 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: ishtar_base/models.py:1431 +#: ishtar_base/models.py:1437 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: ishtar_base/models.py:1439 +#: ishtar_base/models.py:1445 msgid "Warehouse types" msgstr "Types de dépôts" -#: ishtar_base/models.py:1451 +#: ishtar_base/models.py:1457 msgid "Warehouses" msgstr "Dépôts" -#: ishtar_base/models.py:1453 +#: ishtar_base/models.py:1459 msgid "Can view own Warehouse" msgstr "Peut voir son propre Dépôt" -#: ishtar_base/models.py:1454 +#: ishtar_base/models.py:1460 msgid "Can add own Warehouse" msgstr "Peut ajouter son propre Dépôt" -#: ishtar_base/models.py:1455 +#: ishtar_base/models.py:1461 msgid "Can change own Warehouse" msgstr "Peut changer son propre Dépôt" -#: ishtar_base/models.py:1456 +#: ishtar_base/models.py:1462 msgid "Can delete own Warehouse" msgstr "Peut supprimer son propre Dépôt" -#: ishtar_base/models.py:1466 +#: ishtar_base/models.py:1472 msgid "Intended to" msgstr "Destiné à" -#: ishtar_base/models.py:1470 +#: ishtar_base/models.py:1476 msgid "Act types" msgstr "Types d'acte" -#: ishtar_base/models.py:1481 +#: ishtar_base/models.py:1487 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: ishtar_base/models.py:1483 +#: ishtar_base/models.py:1489 msgid "Person in charge of the scientific part" msgstr "Responsable scientifique" -#: ishtar_base/models.py:1498 +#: ishtar_base/models.py:1504 msgid "Administrative acts" msgstr "Actes administratifs" -#: ishtar_base/models.py:1500 +#: ishtar_base/models.py:1506 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: ishtar_base/models.py:1501 +#: ishtar_base/models.py:1507 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: ishtar_base/models.py:1502 +#: ishtar_base/models.py:1508 msgid "Can change own Administrative act" msgstr "Peut changer son propre Acte administratif" -#: ishtar_base/models.py:1503 +#: ishtar_base/models.py:1509 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: ishtar_base/models.py:1512 +#: ishtar_base/models.py:1518 msgid "Length (mm)" msgstr "Longueur (mm) :" -#: ishtar_base/models.py:1513 +#: ishtar_base/models.py:1519 msgid "Width (mm)" msgstr "Largeur (mm) :" -#: ishtar_base/models.py:1514 +#: ishtar_base/models.py:1520 msgid "Height (mm)" msgstr "Hauteur (mm)" -#: ishtar_base/models.py:1520 +#: ishtar_base/models.py:1526 msgid "Container types" msgstr "Types de contenant" -#: ishtar_base/models.py:1532 +#: ishtar_base/models.py:1538 msgid "Containers" msgstr "Contenants" -#: ishtar_base/models.py:1557 templates/sheet_contextrecord.html:71 +#: ishtar_base/models.py:1563 templates/sheet_contextrecord.html:71 #: templates/sheet_file.html:43 templates/sheet_ope.html:46 #: templates/sheet_ope.html.py:107 templates/sheet_ope_modif.html:46 #: templates/sheet_ope_modif.html.py:107 templates/sheet_operation.html:46 msgid "Localisation" msgstr "Localisation" -#: ishtar_base/models.py:1580 +#: ishtar_base/models.py:1586 msgid "Virtual" msgstr "Virtuel" -#: ishtar_base/models.py:1583 +#: ishtar_base/models.py:1589 msgid "Treatment types" msgstr "Types de traitements" -#: ishtar_base/models.py:1600 ishtar_base/models.py:1619 +#: ishtar_base/models.py:1606 ishtar_base/models.py:1625 msgid "Treatment" msgstr "Traitement" -#: ishtar_base/models.py:1601 +#: ishtar_base/models.py:1607 msgid "Treatments" msgstr "Traitements" -#: ishtar_base/models.py:1603 +#: ishtar_base/models.py:1609 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: ishtar_base/models.py:1604 +#: ishtar_base/models.py:1610 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: ishtar_base/models.py:1605 +#: ishtar_base/models.py:1611 msgid "Can change own Treatment" msgstr "Peut changer son propre Traitement" -#: ishtar_base/models.py:1606 +#: ishtar_base/models.py:1612 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre traitement" -#: ishtar_base/models.py:1612 templates/sheet_contextrecord.html:65 +#: ishtar_base/models.py:1618 templates/sheet_contextrecord.html:65 #: templates/sheet_file.html:35 templates/sheet_ope.html:22 #: templates/sheet_ope_modif.html:22 templates/sheet_operation.html:22 msgid "by" msgstr "par" -#: ishtar_base/models.py:1617 +#: ishtar_base/models.py:1623 msgid "Treatment documentation" msgstr "Documentation d'un traitement" -#: ishtar_base/models.py:1618 +#: ishtar_base/models.py:1624 msgid "Treament documentations" msgstr "Documentations des traitements" -#: ishtar_base/models.py:1631 +#: ishtar_base/models.py:1637 msgid "Property" msgstr "Propriété" -#: ishtar_base/models.py:1632 +#: ishtar_base/models.py:1638 msgid "Properties" msgstr "Propriétés" @@ -1643,27 +1643,27 @@ msgstr "Oui" msgid "False" msgstr "Non" -#: ishtar_base/views.py:268 templates/sheet_contextrecord.html:127 +#: ishtar_base/views.py:267 templates/sheet_contextrecord.html:127 #: templates/sheet_file.html:106 templates/sheet_ope.html:139 #: templates/sheet_ope_modif.html:139 templates/sheet_ope_modif.html.py:175 #: templates/sheet_operation.html:138 templates/sheet_operation.html.py:171 msgid "Details" msgstr "Détails" -#: ishtar_base/views.py:603 ishtar_base/views.py:637 +#: ishtar_base/views.py:602 ishtar_base/views.py:636 msgid "Operation not permitted." msgstr "Opération non permise" -#: ishtar_base/views.py:606 +#: ishtar_base/views.py:605 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: ishtar_base/views.py:658 templates/sheet_operation.html:122 +#: ishtar_base/views.py:657 templates/sheet_operation.html:122 msgid "Context records" msgstr "Unité d'Enregistrement" -#: ishtar_base/views.py:659 +#: ishtar_base/views.py:658 msgid "Archaeological items" msgstr "Mobilier" @@ -1729,8 +1729,8 @@ msgstr "Vous avez entré les informations suivantes :" msgid "Would you like to save them?" msgstr "Voulez vous sauver ces informations ?" -#: templates/confirm_wizard.html:30 templates/default_wizard.html:19 -#: templates/default_wizard.html.py:35 templates/search.html:13 +#: templates/confirm_wizard.html:30 templates/default_wizard.html:22 +#: templates/default_wizard.html.py:38 templates/search.html:13 #: templates/towns_wizard.html:18 templates/towns_wizard.html.py:37 msgid "Validate" msgstr "Valider" @@ -1867,11 +1867,15 @@ msgstr "Utilisateurs" msgid "User type" msgstr "Type d'utilisateur" -#: templates/default_wizard.html:26 templates/search.html:20 +#: templates/default_wizard.html:29 templates/search.html:20 #: templates/towns_wizard.html:25 msgid "Add/Modify" msgstr "Ajouter-Modifier" +#: templates/default_wizard.html:39 +msgid "Validate and end" +msgstr "Valider and confirmer" + #: templates/form_snippet.html:9 msgid "Help" msgstr "Aide" @@ -2462,3 +2466,6 @@ msgid "You are now registered. Activation email sent." msgstr "" "Vous être maintenant enregistré. Un courriel d'activation de votre compte " "vous a été envoyé." + +#~ msgid "Is active?" +#~ msgstr "Est actif ?" diff --git a/ishtar/templates/default_wizard.html b/ishtar/templates/default_wizard.html index 561206d23..a71565b6e 100644 --- a/ishtar/templates/default_wizard.html +++ b/ishtar/templates/default_wizard.html @@ -35,8 +35,8 @@ {% endif %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} -<input type="submit" id="submit_form" value="{% trans "Validate" %}"/> -{% if next_steps %}<input type="submit" id="submit_end_form" value="{% trans "Validate and end" %}"/>{% endif %} +<input type="submit" id="submit_form" name='validate' value="{% trans "Validate" %}"/> +{% if next_steps %}<input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans "Validate and end" %}"/>{% endif %} </div> </form> {% endblock %} |