diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-05-11 01:42:48 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-05-11 01:42:48 +0200 |
commit | a3d2037263a6886ffb69fa8217814ec74a906324 (patch) | |
tree | 5bef0b9ef8aabcb0162b343b6b94f7d7e5e4e46d | |
parent | f3b115804f8d4266f7ffb761eaa77012defff553 (diff) | |
download | Ishtar-a3d2037263a6886ffb69fa8217814ec74a906324.tar.bz2 Ishtar-a3d2037263a6886ffb69fa8217814ec74a906324.zip |
Labels corrections - minors
-rw-r--r-- | ishtar/furnitures/forms.py | 4 | ||||
-rw-r--r-- | ishtar/furnitures/models.py | 3 | ||||
-rw-r--r-- | ishtar/locale/fr/LC_MESSAGES/django.po | 529 | ||||
-rw-r--r-- | ishtar/templates/sheet_contextrecord.html | 2 | ||||
-rw-r--r-- | ishtar/templates/towns_wizard.html | 40 |
5 files changed, 316 insertions, 262 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index 54d1d6af7..e9a9159eb 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -1458,7 +1458,7 @@ class OperationWizard(FileWizard): try: for parcel in models.File.objects.get(pk=int(file_id) ).parcels.all(): - parcels.append((parcel.pk, unicode(parcel))) + parcels.append((parcel.pk, parcel.short_label())) except (ValueError, ObjectDoesNotExist): pass data['PARCELS'] = sorted(parcels, key=lambda x:x[1]) @@ -1779,7 +1779,7 @@ operation_modification_wizard = OperationWizard([ 'towns-operation_modification':has_associated_file( 'general-operation_modification'), 'parcelsgeneral-operation_modification':has_associated_file( - 'general-operation_creation', negate=True), + 'general-operation_modification', negate=True), 'parcels-operation_modification':has_associated_file( 'general-operation_modification'), }, diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 17f18a79d..9bbb8bf2d 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -621,6 +621,9 @@ class Parcel(LightHistorizedItem): self.parcel_number] if item]) def __unicode__(self): + return self.short_label() + + def long_label(self): return JOINT.join([unicode(item) for item in \ [self.associated_file, self.operation, self.section, self.parcel_number] if item]) diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po index bc0bd4749..04634b9ee 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-05-10 15:08+0200\n" +"POT-Creation-Date: 2011-05-11 01:40+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -32,14 +32,14 @@ msgstr "courriel" msgid "warehouse" msgstr "dépôt" -#: furnitures/context_processors.py:42 furnitures/forms.py:1519 -#: furnitures/menus.py:102 furnitures/models.py:965 furnitures/models.py:991 +#: furnitures/context_processors.py:42 furnitures/forms.py:1557 +#: furnitures/menus.py:102 furnitures/models.py:968 furnitures/models.py:994 msgid "Archaelogical file" msgstr "Dossier archéologique" -#: furnitures/context_processors.py:43 furnitures/forms.py:1492 +#: furnitures/context_processors.py:43 furnitures/forms.py:1530 #: furnitures/menus.py:132 furnitures/models.py:568 furnitures/models.py:607 -#: furnitures/models.py:966 furnitures/models.py:989 +#: furnitures/models.py:969 furnitures/models.py:992 msgid "Operation" msgstr "Opération" @@ -51,27 +51,27 @@ msgstr "Il y a des mobiliers identiques." msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "Entrez un nom correct composé de lettres, espaces et tirets." -#: furnitures/forms.py:74 furnitures/forms.py:633 furnitures/models.py:319 -#: furnitures/models.py:349 furnitures/models.py:944 furnitures/models.py:1051 +#: furnitures/forms.py:74 furnitures/forms.py:662 furnitures/models.py:319 +#: furnitures/models.py:349 furnitures/models.py:947 furnitures/models.py:1054 msgid "Name" msgstr "Nom" -#: furnitures/forms.py:76 furnitures/models.py:940 furnitures/models.py:946 +#: furnitures/forms.py:76 furnitures/models.py:943 furnitures/models.py:949 msgid "Warehouse type" msgstr "Type de dépôt" -#: furnitures/forms.py:78 furnitures/forms.py:912 furnitures/models.py:428 -#: furnitures/models.py:948 +#: furnitures/forms.py:78 furnitures/forms.py:942 furnitures/models.py:428 +#: furnitures/models.py:951 msgid "Person in charge" msgstr "Responsable" -#: furnitures/forms.py:83 furnitures/forms.py:933 furnitures/forms.py:1535 -#: furnitures/forms.py:2122 furnitures/models.py:130 furnitures/models.py:458 -#: furnitures/models.py:564 furnitures/models.py:949 furnitures/models.py:1029 +#: furnitures/forms.py:83 furnitures/forms.py:963 furnitures/forms.py:1573 +#: furnitures/forms.py:2195 furnitures/models.py:130 furnitures/models.py:458 +#: furnitures/models.py:564 furnitures/models.py:952 furnitures/models.py:1032 msgid "Comment" msgstr "Commentaire" -#: furnitures/forms.py:85 furnitures/forms.py:945 furnitures/models.py:297 +#: furnitures/forms.py:85 furnitures/forms.py:975 furnitures/models.py:297 msgid "Address" msgstr "Adresse" @@ -83,11 +83,11 @@ msgstr "Complément d'adresse" msgid "Postal code" msgstr "Code postal" -#: furnitures/forms.py:91 furnitures/forms.py:95 furnitures/forms.py:882 -#: furnitures/forms.py:962 furnitures/forms.py:991 furnitures/forms.py:1293 -#: furnitures/forms.py:1481 furnitures/forms.py:1590 furnitures/forms.py:1755 -#: furnitures/forms.py:1839 furnitures/forms.py:2053 furnitures/models.py:302 -#: furnitures/models.py:611 furnitures/models.py:1065 +#: furnitures/forms.py:91 furnitures/forms.py:95 furnitures/forms.py:912 +#: furnitures/forms.py:992 furnitures/forms.py:1021 furnitures/forms.py:1324 +#: furnitures/forms.py:1519 furnitures/forms.py:1628 furnitures/forms.py:1827 +#: furnitures/forms.py:1912 furnitures/forms.py:2126 furnitures/models.py:302 +#: furnitures/models.py:611 furnitures/models.py:1068 msgid "Town" msgstr "Commune" @@ -99,7 +99,7 @@ msgstr "Pays" msgid "Phone" msgstr "Téléphone" -#: furnitures/forms.py:112 furnitures/forms.py:785 +#: furnitures/forms.py:112 furnitures/forms.py:814 msgid "Confirm" msgstr "Confirmation" @@ -111,87 +111,87 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: furnitures/forms.py:618 furnitures/forms.py:621 furnitures/forms.py:2094 +#: furnitures/forms.py:647 furnitures/forms.py:650 furnitures/forms.py:2167 #: furnitures/menus.py:89 furnitures/models.py:360 furnitures/models.py:385 -#: furnitures/models.py:1089 furnitures/models.py:1111 -#: furnitures/models.py:1126 +#: furnitures/models.py:1092 furnitures/models.py:1114 +#: furnitures/models.py:1129 msgid "Person" msgstr "Individu" -#: furnitures/forms.py:627 +#: furnitures/forms.py:656 msgid "Identity" msgstr "Identité" -#: furnitures/forms.py:630 furnitures/models.py:347 furnitures/models.py:781 +#: furnitures/forms.py:659 furnitures/models.py:347 furnitures/models.py:784 #: templates/sheet_contextrecord.html:83 templates/sheet_ope.html:104 #: templates/sheet_ope_modif.html:104 templates/sheet_operation.html:104 msgid "Title" msgstr "Titre" -#: furnitures/forms.py:631 furnitures/models.py:348 +#: furnitures/forms.py:660 furnitures/models.py:348 msgid "Surname" msgstr "Prénom" -#: furnitures/forms.py:635 furnitures/forms.py:750 furnitures/models.py:350 +#: furnitures/forms.py:664 furnitures/forms.py:779 furnitures/models.py:350 msgid "Email" msgstr "Courriel" -#: furnitures/forms.py:637 furnitures/models.py:338 +#: furnitures/forms.py:666 furnitures/models.py:338 msgid "Person type" msgstr "Type d'individu" -#: furnitures/forms.py:639 +#: furnitures/forms.py:668 msgid "Current organization" msgstr "Organisation actuelle" -#: furnitures/forms.py:643 furnitures/models.py:354 +#: furnitures/forms.py:672 furnitures/models.py:354 msgid "Is an author?" msgstr "Est un auteur ?" -#: furnitures/forms.py:646 furnitures/models.py:356 +#: furnitures/forms.py:675 furnitures/models.py:356 msgid "In charge of a storage?" msgstr "Est responsable d'un dépôt ?" -#: furnitures/forms.py:668 furnitures/forms.py:752 +#: furnitures/forms.py:697 furnitures/forms.py:781 msgid "New password" msgstr "Nouveau mot de passe" -#: furnitures/forms.py:722 +#: furnitures/forms.py:751 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création - modification du compte" -#: furnitures/forms.py:745 furnitures/forms.py:749 +#: furnitures/forms.py:774 furnitures/forms.py:778 msgid "Account" msgstr "Compte" -#: furnitures/forms.py:756 +#: furnitures/forms.py:785 msgid "New password (confirmation)" msgstr "Nouveau mot de passe (confirmation)" -#: furnitures/forms.py:774 +#: furnitures/forms.py:803 msgid "Your password and confirmation password do not match." msgstr "La vérification du mot de passe a échoué." -#: furnitures/forms.py:779 +#: furnitures/forms.py:808 msgid "You must provide a correct password." msgstr "Vous devez fournir un mot de passe correct." -#: furnitures/forms.py:786 +#: furnitures/forms.py:815 msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: furnitures/forms.py:886 furnitures/forms.py:927 furnitures/models.py:426 +#: furnitures/forms.py:916 furnitures/forms.py:957 furnitures/models.py:426 msgid "File type" msgstr "Type de dossier" -#: furnitures/forms.py:888 furnitures/forms.py:1066 +#: furnitures/forms.py:918 furnitures/forms.py:1096 msgid "Saisine type" msgstr "Type de saisine" -#: furnitures/forms.py:890 furnitures/forms.py:917 furnitures/forms.py:937 -#: furnitures/forms.py:997 furnitures/forms.py:1489 furnitures/forms.py:1531 -#: furnitures/forms.py:1843 furnitures/forms.py:2055 furnitures/models.py:421 +#: furnitures/forms.py:920 furnitures/forms.py:947 furnitures/forms.py:967 +#: furnitures/forms.py:1027 furnitures/forms.py:1527 furnitures/forms.py:1569 +#: furnitures/forms.py:1916 furnitures/forms.py:2128 furnitures/models.py:421 #: furnitures/models.py:539 furnitures/models.py:608 #: templates/sheet_file.html:68 templates/sheet_file.html.py:88 #: templates/sheet_file.html:116 templates/sheet_ope.html:61 @@ -201,148 +201,148 @@ msgstr "Type de saisine" msgid "Year" msgstr "Année" -#: furnitures/forms.py:893 furnitures/models.py:462 +#: furnitures/forms.py:923 furnitures/models.py:462 msgid "Archaeological file" msgstr "Dossier archéologique" -#: furnitures/forms.py:904 +#: furnitures/forms.py:934 msgid "You should select a file." msgstr "Vous devez sélectionner un dossier archéologique." -#: furnitures/forms.py:908 furnitures/forms.py:1276 furnitures/forms.py:1507 -#: furnitures/forms.py:1770 furnitures/forms.py:1867 +#: furnitures/forms.py:938 furnitures/forms.py:1307 furnitures/forms.py:1545 +#: furnitures/forms.py:1842 furnitures/forms.py:1940 #: 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" -#: furnitures/forms.py:921 furnitures/forms.py:939 furnitures/models.py:423 +#: furnitures/forms.py:951 furnitures/forms.py:969 furnitures/models.py:423 msgid "Numeric reference" msgstr "Référence numérique" -#: furnitures/forms.py:923 furnitures/forms.py:941 furnitures/models.py:424 +#: furnitures/forms.py:953 furnitures/forms.py:971 furnitures/models.py:424 msgid "Internal reference" msgstr "Référence interne" -#: furnitures/forms.py:925 furnitures/models.py:439 +#: furnitures/forms.py:955 furnitures/models.py:439 msgid "Creation date" msgstr "Date de création" -#: furnitures/forms.py:929 furnitures/models.py:443 +#: furnitures/forms.py:959 furnitures/models.py:443 msgid "Related file" msgstr "Dossier en relation avec" -#: furnitures/forms.py:949 furnitures/forms.py:1528 furnitures/models.py:450 +#: furnitures/forms.py:979 furnitures/forms.py:1566 furnitures/models.py:450 msgid "Total surface" msgstr "Surface totale" -#: furnitures/forms.py:952 furnitures/models.py:453 +#: furnitures/forms.py:982 furnitures/models.py:453 msgid "Main address" msgstr "Adresse principale" -#: furnitures/forms.py:953 furnitures/models.py:454 +#: furnitures/forms.py:983 furnitures/models.py:454 msgid "Main address - complement" msgstr "Adresse principale - complément" -#: furnitures/forms.py:955 furnitures/models.py:456 +#: furnitures/forms.py:985 furnitures/models.py:456 msgid "Main address - postal code" msgstr "Adresse principale - code postal" -#: furnitures/forms.py:959 furnitures/forms.py:985 furnitures/forms.py:1588 -#: furnitures/forms.py:1609 furnitures/forms.py:1613 furnitures/models.py:438 -#: furnitures/models.py:547 furnitures/models.py:1066 +#: furnitures/forms.py:989 furnitures/forms.py:1015 furnitures/forms.py:1626 +#: furnitures/forms.py:1647 furnitures/forms.py:1651 furnitures/models.py:438 +#: furnitures/models.py:547 furnitures/models.py:1069 msgid "Towns" msgstr "Communes" -#: furnitures/forms.py:981 +#: furnitures/forms.py:1011 msgid "There are identical towns." msgstr "Il y a des communes identiques." -#: furnitures/forms.py:988 furnitures/forms.py:1036 furnitures/forms.py:1616 -#: furnitures/forms.py:1637 furnitures/forms.py:1641 furnitures/models.py:617 +#: furnitures/forms.py:1018 furnitures/forms.py:1066 furnitures/forms.py:1654 +#: furnitures/forms.py:1675 furnitures/forms.py:1679 furnitures/models.py:617 msgid "Parcels" msgstr "Parcelles" -#: furnitures/forms.py:993 furnitures/models.py:612 +#: furnitures/forms.py:1023 furnitures/models.py:612 #: templates/sheet_ope.html:62 templates/sheet_ope_modif.html:62 #: templates/sheet_operation.html:63 msgid "Section" msgstr "Section" -#: furnitures/forms.py:995 furnitures/models.py:613 +#: furnitures/forms.py:1025 furnitures/models.py:613 msgid "Parcel number" msgstr "Numéro de parcelle" -#: furnitures/forms.py:1025 +#: furnitures/forms.py:1055 msgid "All fields are required" msgstr "Tous les champs sont nécessaires" -#: furnitures/forms.py:1039 +#: furnitures/forms.py:1069 msgid "Preventive informations" msgstr "Information archéologie préventive" -#: furnitures/forms.py:1044 furnitures/models.py:430 +#: furnitures/forms.py:1074 furnitures/models.py:430 msgid "General contractor" msgstr "Aménageur" -#: furnitures/forms.py:1051 furnitures/models.py:432 +#: furnitures/forms.py:1081 furnitures/models.py:432 msgid "Town planning service" msgstr "Service instructeur" -#: furnitures/forms.py:1057 furnitures/models.py:408 furnitures/models.py:433 +#: furnitures/forms.py:1087 furnitures/models.py:408 furnitures/models.py:433 msgid "Permit type" msgstr "Type de permis" -#: furnitures/forms.py:1059 furnitures/models.py:435 +#: furnitures/forms.py:1089 furnitures/models.py:435 msgid "Permit reference" msgstr "Référence du permis" -#: furnitures/forms.py:1062 furnitures/models.py:451 +#: furnitures/forms.py:1092 furnitures/models.py:451 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: furnitures/forms.py:1068 furnitures/models.py:441 +#: furnitures/forms.py:1098 furnitures/models.py:441 msgid "Reception date" msgstr "Date de réception" -#: furnitures/forms.py:1203 templates/sheet_file.html:86 +#: furnitures/forms.py:1233 templates/sheet_file.html:86 msgid "Associated operations" msgstr "Opérations associées" -#: furnitures/forms.py:1222 +#: furnitures/forms.py:1252 msgid "Would you like to delete this archaelogical file ?" msgstr "Voulez vous supprimer ce dossier archéologique ?" -#: furnitures/forms.py:1279 furnitures/forms.py:1297 furnitures/forms.py:1759 -#: furnitures/forms.py:1771 furnitures/models.py:971 furnitures/models.py:979 +#: furnitures/forms.py:1310 furnitures/forms.py:1328 furnitures/forms.py:1831 +#: furnitures/forms.py:1843 furnitures/models.py:974 furnitures/models.py:982 msgid "Act type" msgstr "Type d'acte" -#: furnitures/forms.py:1281 furnitures/models.py:987 +#: furnitures/forms.py:1312 furnitures/models.py:990 msgid "Signatory" msgstr "Signataire" -#: furnitures/forms.py:1285 furnitures/models.py:993 +#: furnitures/forms.py:1316 furnitures/models.py:996 msgid "Object" msgstr "Objet" -#: furnitures/forms.py:1287 furnitures/models.py:992 +#: furnitures/forms.py:1318 furnitures/models.py:995 msgid "Signature date" msgstr "Date de signature" -#: furnitures/forms.py:1301 +#: furnitures/forms.py:1332 msgid "Administrative Act" msgstr "Acte administratif" -#: furnitures/forms.py:1313 +#: furnitures/forms.py:1344 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: furnitures/forms.py:1332 +#: furnitures/forms.py:1363 msgid "Would you like to delete this administrative act?" msgstr "Voulez vous supprimer cet acte administratif ?" -#: furnitures/forms.py:1475 +#: furnitures/forms.py:1513 msgid "" "Warning: No Archaelogical File is provided. If you have forget it return to " "the first step." @@ -350,39 +350,39 @@ 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." -#: furnitures/forms.py:1485 furnitures/forms.py:1523 furnitures/models.py:515 +#: furnitures/forms.py:1523 furnitures/forms.py:1561 furnitures/models.py:515 #: furnitures/models.py:544 msgid "Operation type" msgstr "Type d'opération" -#: furnitures/forms.py:1487 furnitures/models.py:546 +#: furnitures/forms.py:1525 furnitures/models.py:546 msgid "Remains" msgstr "Vestiges" -#: furnitures/forms.py:1503 +#: furnitures/forms.py:1541 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: furnitures/forms.py:1512 furnitures/models.py:981 +#: furnitures/forms.py:1550 furnitures/models.py:984 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: furnitures/forms.py:1525 furnitures/forms.py:1917 furnitures/forms.py:2033 -#: furnitures/forms.py:2103 furnitures/models.py:535 furnitures/models.py:630 -#: furnitures/models.py:654 furnitures/models.py:928 furnitures/models.py:1091 -#: furnitures/models.py:1127 templates/sheet_file.html:93 +#: furnitures/forms.py:1563 furnitures/forms.py:1990 furnitures/forms.py:2106 +#: furnitures/forms.py:2176 furnitures/models.py:535 furnitures/models.py:633 +#: furnitures/models.py:657 furnitures/models.py:931 furnitures/models.py:1094 +#: furnitures/models.py:1130 templates/sheet_file.html:93 msgid "Start date" msgstr "Date de début" -#: furnitures/forms.py:1539 +#: furnitures/forms.py:1577 msgid "References" msgstr "Référence" -#: furnitures/forms.py:1546 furnitures/models.py:540 +#: furnitures/forms.py:1584 furnitures/models.py:540 msgid "Operation code" msgstr "Code de l'opération" -#: furnitures/forms.py:1563 +#: furnitures/forms.py:1601 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -391,32 +391,32 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: furnitures/forms.py:1569 +#: furnitures/forms.py:1607 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: furnitures/forms.py:1570 furnitures/models.py:548 +#: furnitures/forms.py:1608 furnitures/models.py:548 msgid "Cost" msgstr "Coût" -#: furnitures/forms.py:1578 +#: furnitures/forms.py:1616 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: furnitures/forms.py:1581 furnitures/models.py:559 +#: furnitures/forms.py:1619 furnitures/models.py:559 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: furnitures/forms.py:1583 furnitures/models.py:561 +#: furnitures/forms.py:1621 furnitures/models.py:561 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: furnitures/forms.py:1585 furnitures/models.py:563 +#: furnitures/forms.py:1623 furnitures/models.py:563 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: furnitures/forms.py:1618 furnitures/forms.py:1869 furnitures/models.py:616 -#: furnitures/models.py:709 furnitures/models.py:927 +#: furnitures/forms.py:1656 furnitures/forms.py:1942 furnitures/models.py:616 +#: furnitures/models.py:712 furnitures/models.py:930 #: templates/sheet_contextrecord.html:110 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 @@ -425,59 +425,59 @@ msgstr "Prescription sur un contexte géoarchéologique" msgid "Parcel" msgstr "Parcelle" -#: furnitures/forms.py:1644 furnitures/forms.py:1656 furnitures/models.py:530 +#: furnitures/forms.py:1682 furnitures/forms.py:1694 furnitures/models.py:530 msgid "Remain types" msgstr "Types de vestige" -#: furnitures/forms.py:1646 furnitures/models.py:529 +#: furnitures/forms.py:1684 furnitures/models.py:529 msgid "Remain type" msgstr "Type de vestige" -#: furnitures/forms.py:1659 furnitures/forms.py:1671 furnitures/models.py:549 +#: furnitures/forms.py:1697 furnitures/forms.py:1709 furnitures/models.py:549 #: templates/sheet_contextrecord.html:106 templates/sheet_ope_modif.html:153 #: templates/sheet_operation.html:155 msgid "Periods" msgstr "Périodes" -#: furnitures/forms.py:1661 furnitures/forms.py:1844 furnitures/forms.py:1915 -#: furnitures/forms.py:2031 furnitures/forms.py:2057 furnitures/models.py:653 +#: furnitures/forms.py:1699 furnitures/forms.py:1917 furnitures/forms.py:1988 +#: furnitures/forms.py:2104 furnitures/forms.py:2130 furnitures/models.py:656 msgid "Period" msgstr "Période" -#: furnitures/forms.py:1717 furnitures/forms.py:1718 furnitures/models.py:536 +#: furnitures/forms.py:1789 furnitures/forms.py:1790 furnitures/models.py:536 msgid "Closing date" msgstr "Date de clotûre" -#: furnitures/forms.py:1728 +#: furnitures/forms.py:1800 msgid "Would you like to close this operation?" msgstr "Voulez vous clôturer cette opération ?" -#: furnitures/forms.py:1738 +#: furnitures/forms.py:1810 msgid "Would you like to delete this operation?" msgstr "Voulez vous supprimer cette opération ?" -#: furnitures/forms.py:1846 +#: furnitures/forms.py:1919 msgid "Unit type" msgstr "Type d'unité" -#: furnitures/forms.py:1850 furnitures/menus.py:174 +#: furnitures/forms.py:1923 furnitures/menus.py:174 #: templates/sheet_contextrecord.html:105 templates/sheet_operation.html:154 msgid "Context record" msgstr "Unité d'Enregistrement" -#: furnitures/forms.py:1861 +#: furnitures/forms.py:1934 msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." -#: furnitures/forms.py:1870 furnitures/forms.py:2015 furnitures/forms.py:2149 -#: furnitures/models.py:711 furnitures/models.py:801 furnitures/models.py:879 +#: furnitures/forms.py:1943 furnitures/forms.py:2088 furnitures/forms.py:2222 +#: furnitures/models.py:714 furnitures/models.py:804 furnitures/models.py:882 #: templates/sheet_ope.html:125 templates/sheet_ope_modif.html:125 #: templates/sheet_operation.html:124 msgid "ID" msgstr "Identifiant" -#: furnitures/forms.py:1872 furnitures/forms.py:2092 furnitures/models.py:712 -#: furnitures/models.py:802 furnitures/models.py:880 furnitures/models.py:1084 +#: furnitures/forms.py:1945 furnitures/forms.py:2165 furnitures/models.py:715 +#: furnitures/models.py:805 furnitures/models.py:883 furnitures/models.py:1087 #: templates/sheet_contextrecord.html:23 #: templates/sheet_contextrecord.html:107 templates/sheet_ope.html:128 #: templates/sheet_ope_modif.html:128 templates/sheet_ope_modif.html.py:154 @@ -485,179 +485,179 @@ msgstr "Identifiant" msgid "Description" msgstr "Description" -#: furnitures/forms.py:1874 furnitures/models.py:713 furnitures/models.py:1014 +#: furnitures/forms.py:1947 furnitures/models.py:716 furnitures/models.py:1017 msgid "Length" msgstr "Longueur (cm)" -#: furnitures/forms.py:1875 furnitures/models.py:714 furnitures/models.py:1015 +#: furnitures/forms.py:1948 furnitures/models.py:717 furnitures/models.py:1018 msgid "Width" msgstr "Largeur (cm)" -#: furnitures/forms.py:1876 furnitures/models.py:715 +#: furnitures/forms.py:1949 furnitures/models.py:718 msgid "Thickness" msgstr "Épaisseur (cm)" -#: furnitures/forms.py:1877 furnitures/models.py:716 +#: furnitures/forms.py:1950 furnitures/models.py:719 msgid "Depth" msgstr "Profondeur (cm)" -#: furnitures/forms.py:1878 furnitures/models.py:721 +#: furnitures/forms.py:1951 furnitures/models.py:724 msgid "Unit" msgstr "Unité" -#: furnitures/forms.py:1880 furnitures/forms.py:2098 furnitures/models.py:717 -#: furnitures/models.py:1025 furnitures/models.py:1087 +#: furnitures/forms.py:1953 furnitures/forms.py:2171 furnitures/models.py:720 +#: furnitures/models.py:1028 furnitures/models.py:1090 msgid "Location" msgstr "Lieu" -#: furnitures/forms.py:1910 furnitures/forms.py:1926 furnitures/forms.py:2026 -#: furnitures/models.py:662 furnitures/models.py:890 +#: furnitures/forms.py:1983 furnitures/forms.py:1999 furnitures/forms.py:2099 +#: furnitures/models.py:665 furnitures/models.py:893 msgid "Dating" msgstr "Datation" -#: furnitures/forms.py:1918 furnitures/forms.py:2035 furnitures/forms.py:2105 -#: furnitures/models.py:631 furnitures/models.py:655 furnitures/models.py:929 -#: furnitures/models.py:1092 furnitures/models.py:1128 +#: furnitures/forms.py:1991 furnitures/forms.py:2108 furnitures/forms.py:2178 +#: furnitures/models.py:634 furnitures/models.py:658 furnitures/models.py:932 +#: furnitures/models.py:1095 furnitures/models.py:1131 #: templates/sheet_file.html:94 msgid "End date" msgstr "Date de fin" -#: furnitures/forms.py:1919 furnitures/forms.py:2036 furnitures/models.py:658 +#: furnitures/forms.py:1992 furnitures/forms.py:2109 furnitures/models.py:661 msgid "Quality" msgstr "Qualité" -#: furnitures/forms.py:1921 furnitures/forms.py:2038 furnitures/models.py:644 -#: furnitures/models.py:656 +#: furnitures/forms.py:1994 furnitures/forms.py:2111 furnitures/models.py:647 +#: furnitures/models.py:659 msgid "Dating type" msgstr "Type de datation" -#: furnitures/forms.py:1929 furnitures/forms.py:1936 furnitures/models.py:726 +#: furnitures/forms.py:2002 furnitures/forms.py:2009 furnitures/models.py:729 #: templates/sheet_contextrecord.html:32 msgid "Interpretation" msgstr "Interpretation" -#: furnitures/forms.py:1932 +#: furnitures/forms.py:2005 msgid "Has furniture?" msgstr "A du matériel ?" -#: furnitures/forms.py:1934 furnitures/models.py:725 +#: furnitures/forms.py:2007 furnitures/models.py:728 msgid "Filling" msgstr "Remplissage" -#: furnitures/forms.py:1938 furnitures/models.py:741 +#: furnitures/forms.py:2011 furnitures/models.py:744 msgid "Activity" msgstr "Activité" -#: furnitures/forms.py:1940 furnitures/models.py:739 +#: furnitures/forms.py:2013 furnitures/models.py:742 msgid "Identification" msgstr "Identification" -#: furnitures/forms.py:1942 furnitures/models.py:728 +#: furnitures/forms.py:2015 furnitures/models.py:731 msgid "TAQ" msgstr "TAQ" -#: furnitures/forms.py:1943 furnitures/models.py:731 +#: furnitures/forms.py:2016 furnitures/models.py:734 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: furnitures/forms.py:1945 furnitures/models.py:733 +#: furnitures/forms.py:2018 furnitures/models.py:736 msgid "TPQ" msgstr "TPQ" -#: furnitures/forms.py:1946 furnitures/models.py:736 +#: furnitures/forms.py:2019 furnitures/models.py:739 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: furnitures/forms.py:1984 +#: furnitures/forms.py:2057 msgid "Would you like to delete this context record?" msgstr "Voulez vous supprimer cette Unité d'Enregistrement ?" -#: furnitures/forms.py:2003 furnitures/models.py:813 furnitures/models.py:876 +#: furnitures/forms.py:2076 furnitures/models.py:816 furnitures/models.py:879 msgid "Base item" msgstr "Mobilier de base" -#: furnitures/forms.py:2005 +#: furnitures/forms.py:2078 msgid "General ID" msgstr "Identifiant général" -#: furnitures/forms.py:2007 +#: furnitures/forms.py:2080 msgid "General description" msgstr "Description générale" -#: furnitures/forms.py:2009 furnitures/forms.py:2060 furnitures/models.py:805 +#: furnitures/forms.py:2082 furnitures/forms.py:2133 furnitures/models.py:808 msgid "Is isolated?" msgstr "Est isolé ?" -#: furnitures/forms.py:2013 furnitures/forms.py:2063 furnitures/menus.py:193 -#: furnitures/models.py:894 furnitures/models.py:1123 +#: furnitures/forms.py:2086 furnitures/forms.py:2136 furnitures/menus.py:193 +#: furnitures/models.py:897 furnitures/models.py:1126 msgid "Item" msgstr "Mobilier" -#: furnitures/forms.py:2017 furnitures/forms.py:2151 +#: furnitures/forms.py:2090 furnitures/forms.py:2224 msgid "Precise description" msgstr "Description précise" -#: furnitures/forms.py:2019 furnitures/forms.py:2059 furnitures/forms.py:2153 -#: furnitures/models.py:797 furnitures/models.py:882 +#: furnitures/forms.py:2092 furnitures/forms.py:2132 furnitures/forms.py:2226 +#: furnitures/models.py:800 furnitures/models.py:885 #: templates/sheet_contextrecord.html:104 templates/sheet_operation.html:153 msgid "Material type" msgstr "Type de matériaux" -#: furnitures/forms.py:2021 furnitures/forms.py:2155 furnitures/models.py:883 -#: furnitures/models.py:1017 +#: furnitures/forms.py:2094 furnitures/forms.py:2228 furnitures/models.py:886 +#: furnitures/models.py:1020 msgid "Volume" msgstr "Volume" -#: furnitures/forms.py:2022 furnitures/forms.py:2156 furnitures/models.py:884 +#: furnitures/forms.py:2095 furnitures/forms.py:2229 furnitures/models.py:887 #: templates/sheet_contextrecord.html:108 templates/sheet_ope_modif.html:155 #: templates/sheet_operation.html:157 msgid "Weight" msgstr "Poids" -#: furnitures/forms.py:2023 furnitures/forms.py:2157 furnitures/models.py:885 +#: furnitures/forms.py:2096 furnitures/forms.py:2230 furnitures/models.py:888 msgid "Item number" msgstr "Nombre d'artefacts" -#: furnitures/forms.py:2086 +#: furnitures/forms.py:2159 msgid "Base treatment" msgstr "Traitement de base" -#: furnitures/forms.py:2090 furnitures/models.py:1078 -#: furnitures/models.py:1086 +#: furnitures/forms.py:2163 furnitures/models.py:1081 +#: furnitures/models.py:1089 msgid "Treatment type" msgstr "Type de traitement" -#: furnitures/forms.py:2109 +#: furnitures/forms.py:2182 msgid "Upstream items" msgstr "Mobilier amont" -#: furnitures/forms.py:2117 furnitures/models.py:1032 -#: furnitures/models.py:1082 +#: furnitures/forms.py:2190 furnitures/models.py:1035 +#: furnitures/models.py:1085 msgid "Container" msgstr "Contenant" -#: furnitures/forms.py:2119 furnitures/models.py:1018 -#: furnitures/models.py:1028 templates/sheet_file.html:69 +#: furnitures/forms.py:2192 furnitures/models.py:1021 +#: furnitures/models.py:1031 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 msgid "Reference" msgstr "Référence" -#: furnitures/forms.py:2120 furnitures/models.py:1021 -#: furnitures/models.py:1027 +#: furnitures/forms.py:2193 furnitures/models.py:1024 +#: furnitures/models.py:1030 msgid "Container type" msgstr "Type de contenant" -#: furnitures/forms.py:2147 +#: furnitures/forms.py:2220 msgid "Resulting item" msgstr "Mobilier résultant" -#: furnitures/forms.py:2161 +#: furnitures/forms.py:2234 msgid "Resulting items" msgstr "Mobiliers résultants" -#: furnitures/forms.py:2164 +#: furnitures/forms.py:2237 msgid "Upstream item" msgstr "Mobilier amont" @@ -690,8 +690,8 @@ msgstr "Recherche" msgid "Deletion" msgstr "Suppression" -#: furnitures/menus.py:116 furnitures/menus.py:155 furnitures/models.py:999 -#: furnitures/models.py:1125 +#: furnitures/menus.py:116 furnitures/menus.py:155 furnitures/models.py:1002 +#: furnitures/models.py:1128 msgid "Administrative act" msgstr "Acte administratif" @@ -708,7 +708,7 @@ msgstr "Clotûre" msgid "Add a treatment" msgstr "Ajouter un traitement" -#: furnitures/menus.py:212 furnitures/models.py:952 +#: furnitures/menus.py:212 furnitures/models.py:955 msgid "Warehouse" msgstr "Dépôt" @@ -740,11 +740,11 @@ msgstr "Dossiers" msgid "Operations" msgstr "Opérations" -#: furnitures/menus.py:235 furnitures/models.py:1097 +#: furnitures/menus.py:235 furnitures/models.py:1100 msgid "Treatments" msgstr "Traitements" -#: furnitures/menus.py:238 furnitures/models.py:953 +#: furnitures/menus.py:238 furnitures/models.py:956 msgid "Warehouses" msgstr "Dépôts" @@ -796,7 +796,7 @@ msgstr "Type d'organisation" msgid "Organization types" msgstr "Types d'organisation" -#: furnitures/models.py:321 furnitures/models.py:351 furnitures/models.py:782 +#: furnitures/models.py:321 furnitures/models.py:351 furnitures/models.py:785 #: templates/sheet_contextrecord.html:84 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 @@ -967,72 +967,72 @@ msgstr "Peut changer sa propre Opération" msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: furnitures/models.py:629 furnitures/models.py:673 furnitures/models.py:685 -#: furnitures/models.py:695 furnitures/models.py:878 +#: furnitures/models.py:632 furnitures/models.py:676 furnitures/models.py:688 +#: furnitures/models.py:698 furnitures/models.py:881 msgid "Order" msgstr "Ordre" -#: furnitures/models.py:632 +#: furnitures/models.py:635 msgid "Parent period" msgstr "Période parente" -#: furnitures/models.py:636 +#: furnitures/models.py:639 msgid "Type Period" msgstr "Type de période" -#: furnitures/models.py:637 +#: furnitures/models.py:640 msgid "Types Period" msgstr "Types de période" -#: furnitures/models.py:645 +#: furnitures/models.py:648 msgid "Dating types" msgstr "Types de datation" -#: furnitures/models.py:649 +#: furnitures/models.py:652 msgid "Dating quality" msgstr "Qualité de datation" -#: furnitures/models.py:650 +#: furnitures/models.py:653 msgid "Dating qualities" msgstr "Qualités de datation" -#: furnitures/models.py:663 +#: furnitures/models.py:666 msgid "Datings" msgstr "Datations" -#: furnitures/models.py:674 +#: furnitures/models.py:677 msgid "Parent unit" msgstr "Unité parente" -#: furnitures/models.py:678 +#: furnitures/models.py:681 msgid "Type Unit" msgstr "Type d'unité" -#: furnitures/models.py:679 +#: furnitures/models.py:682 msgid "Types Unit" msgstr "Types d'unité" -#: furnitures/models.py:688 +#: furnitures/models.py:691 msgid "Type Activity" msgstr "Type d'activité" -#: furnitures/models.py:689 +#: furnitures/models.py:692 msgid "Types Activity" msgstr "Types d'activités" -#: furnitures/models.py:697 +#: furnitures/models.py:700 msgid "Type Identification" msgstr "Type d'identification" -#: furnitures/models.py:698 +#: furnitures/models.py:701 msgid "Types Identification" msgstr "Types d'identification" -#: furnitures/models.py:719 +#: furnitures/models.py:722 msgid "A short description of the location of the context record" msgstr "Une courte description de la situation de l'Unité d'Enregistrement" -#: furnitures/models.py:729 +#: furnitures/models.py:732 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -1040,11 +1040,11 @@ msgstr "" "« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été crée après " "cette date" -#: furnitures/models.py:732 +#: furnitures/models.py:735 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: furnitures/models.py:734 +#: furnitures/models.py:737 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -1052,197 +1052,197 @@ msgstr "" "« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été crée avant " "cette date" -#: furnitures/models.py:737 +#: furnitures/models.py:740 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: furnitures/models.py:745 furnitures/models.py:746 furnitures/models.py:804 +#: furnitures/models.py:748 furnitures/models.py:749 furnitures/models.py:807 #: templates/sheet_contextrecord.html:6 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: furnitures/models.py:748 +#: furnitures/models.py:751 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: furnitures/models.py:749 +#: furnitures/models.py:752 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: furnitures/models.py:750 +#: furnitures/models.py:753 msgid "Can change own Context Record" msgstr "Peut changer sa propre Unité d'Enregistrement" -#: furnitures/models.py:751 +#: furnitures/models.py:754 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: furnitures/models.py:777 +#: furnitures/models.py:780 msgid "Source type" msgstr "Type de source" -#: furnitures/models.py:778 +#: furnitures/models.py:781 msgid "Source types" msgstr "Types de source" -#: furnitures/models.py:785 furnitures/models.py:1112 +#: furnitures/models.py:788 furnitures/models.py:1115 msgid "Source" msgstr "Source" -#: furnitures/models.py:786 +#: furnitures/models.py:789 msgid "Sources" msgstr "Sources" -#: furnitures/models.py:792 +#: furnitures/models.py:795 msgid "Recommendation" msgstr "Recommendation" -#: furnitures/models.py:794 +#: furnitures/models.py:797 msgid "Parent material" msgstr "Matériau parent" -#: furnitures/models.py:798 +#: furnitures/models.py:801 msgid "Material types" msgstr "Types de matériaux" -#: furnitures/models.py:814 +#: furnitures/models.py:817 msgid "Base items" msgstr "Mobiliers de base" -#: furnitures/models.py:816 +#: furnitures/models.py:819 msgid "Can view own Base item" msgstr "Peut voir son propre Mobilier de base" -#: furnitures/models.py:817 +#: furnitures/models.py:820 msgid "Can add own Base item" msgstr "Peut ajouter son propre Mobilier de base" -#: furnitures/models.py:818 +#: furnitures/models.py:821 msgid "Can change own Base item" msgstr "Peut changer son propre Mobilier de base" -#: furnitures/models.py:819 +#: furnitures/models.py:822 msgid "Can delete own Base item" msgstr "Peut supprimer son propre Mobilier de base" -#: furnitures/models.py:835 +#: furnitures/models.py:838 msgid ":" msgstr ": " -#: furnitures/models.py:887 +#: furnitures/models.py:890 msgid "Upstream treatment" msgstr "Traitement amont" -#: furnitures/models.py:889 +#: furnitures/models.py:892 msgid "Downstream treatment" msgstr "Traitement aval" -#: furnitures/models.py:895 +#: furnitures/models.py:898 msgid "Items" msgstr "Mobiliers" -#: furnitures/models.py:897 +#: furnitures/models.py:900 msgid "Can view own Item" msgstr "Peut voir son propre Mobilier" -#: furnitures/models.py:898 +#: furnitures/models.py:901 msgid "Can add own Item" msgstr "Peut ajouter son propre Mobilier" -#: furnitures/models.py:899 +#: furnitures/models.py:902 msgid "Can change own Item" msgstr "Peut changer son propre Mobilier" -#: furnitures/models.py:900 +#: furnitures/models.py:903 msgid "Can delete own Item" msgstr "Peut supprimer son propre Mobilier" -#: furnitures/models.py:926 templates/sheet_ope.html:64 +#: furnitures/models.py:929 templates/sheet_ope.html:64 #: templates/sheet_ope_modif.html:64 msgid "Owner" msgstr "Propriétaire" -#: furnitures/models.py:932 +#: furnitures/models.py:935 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: furnitures/models.py:933 +#: furnitures/models.py:936 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: furnitures/models.py:941 +#: furnitures/models.py:944 msgid "Warehouse types" msgstr "Types de dépôts" -#: furnitures/models.py:955 +#: furnitures/models.py:958 msgid "Can view own Warehouse" msgstr "Peut voir son propre Dépôt" -#: furnitures/models.py:956 +#: furnitures/models.py:959 msgid "Can add own Warehouse" msgstr "Peut ajouter son propre Dépôt" -#: furnitures/models.py:957 +#: furnitures/models.py:960 msgid "Can change own Warehouse" msgstr "Peut changer son propre Dépôt" -#: furnitures/models.py:958 +#: furnitures/models.py:961 msgid "Can delete own Warehouse" msgstr "Peut supprimer son propre Dépôt" -#: furnitures/models.py:968 +#: furnitures/models.py:971 msgid "Intended to" msgstr "Destiné à" -#: furnitures/models.py:972 +#: furnitures/models.py:975 msgid "Act types" msgstr "Types d'acte" -#: furnitures/models.py:983 +#: furnitures/models.py:986 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: furnitures/models.py:985 +#: furnitures/models.py:988 msgid "Person in charge of the scientific part" msgstr "Responsable scientifique" -#: furnitures/models.py:1000 +#: furnitures/models.py:1003 msgid "Administrative acts" msgstr "Actes administratifs" -#: furnitures/models.py:1002 +#: furnitures/models.py:1005 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: furnitures/models.py:1003 +#: furnitures/models.py:1006 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: furnitures/models.py:1004 +#: furnitures/models.py:1007 msgid "Can change own Administrative act" msgstr "Peut changer son propre Acte administratif" -#: furnitures/models.py:1005 +#: furnitures/models.py:1008 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: furnitures/models.py:1016 +#: furnitures/models.py:1019 msgid "Height" msgstr "Hauteur" -#: furnitures/models.py:1022 +#: furnitures/models.py:1025 msgid "Container types" msgstr "Types de contenant" -#: furnitures/models.py:1033 +#: furnitures/models.py:1036 msgid "Containers" msgstr "Contenants" -#: furnitures/models.py:1052 +#: furnitures/models.py:1055 msgid "Surface" msgstr "Surface" -#: furnitures/models.py:1053 templates/sheet_contextrecord.html:72 +#: furnitures/models.py:1056 templates/sheet_contextrecord.html:72 #: templates/sheet_contextrecord.html:86 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 @@ -1250,57 +1250,57 @@ msgstr "Surface" msgid "Localisation" msgstr "Localisation" -#: furnitures/models.py:1076 +#: furnitures/models.py:1079 msgid "Virtual" msgstr "Virtuel" -#: furnitures/models.py:1079 +#: furnitures/models.py:1082 msgid "Treatment types" msgstr "Types de traitements" -#: furnitures/models.py:1096 +#: furnitures/models.py:1099 msgid "Treatment" msgstr "Traitement" -#: furnitures/models.py:1099 +#: furnitures/models.py:1102 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: furnitures/models.py:1100 +#: furnitures/models.py:1103 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: furnitures/models.py:1101 +#: furnitures/models.py:1104 msgid "Can change own Treatment" msgstr "Peut changer son propre Traitement" -#: furnitures/models.py:1102 +#: furnitures/models.py:1105 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre traitement" -#: furnitures/models.py:1107 furnitures/models.py:1113 +#: furnitures/models.py:1110 furnitures/models.py:1116 msgid "Author type" msgstr "Type d'auteur" -#: furnitures/models.py:1108 +#: furnitures/models.py:1111 msgid "Author types" msgstr "Types d'auteur" -#: furnitures/models.py:1116 +#: furnitures/models.py:1119 msgid "Author" msgstr "Auteur" -#: furnitures/models.py:1117 templates/sheet_contextrecord.html:85 +#: furnitures/models.py:1120 templates/sheet_contextrecord.html:85 #: templates/sheet_ope.html:106 templates/sheet_ope_modif.html:106 #: templates/sheet_operation.html:106 msgid "Authors" msgstr "Auteurs" -#: furnitures/models.py:1131 +#: furnitures/models.py:1134 msgid "Property" msgstr "Propriété" -#: furnitures/models.py:1132 +#: furnitures/models.py:1135 msgid "Properties" msgstr "Propriétés" @@ -1383,10 +1383,12 @@ msgstr "Voulez vous sauver ces informations ?" #: templates/confirm_wizard.html:30 templates/default_wizard.html:17 #: templates/default_wizard.html.py:33 templates/search.html:13 +#: templates/towns_wizard.html:18 templates/towns_wizard.html.py:37 msgid "Validate" msgstr "Valider" #: templates/default_wizard.html:24 templates/search.html:20 +#: templates/towns_wizard.html:25 msgid "Add/Modify" msgstr "Ajouter-Modifier" @@ -1608,9 +1610,9 @@ msgstr "Mobilier" msgid "Numbers" msgstr "Nombre" -#: templates/sheet_contextrecord.html:132 templates/sheet_ope_modif.html:178 -msgid "No find associated to this operation" -msgstr "Pas de mobilier associé à cette opération" +#: templates/sheet_contextrecord.html:132 +msgid "No find associated to this context record" +msgstr "Pas de mobilier associé à cette Unité d'Enregistrement" #: templates/sheet_file.html:7 msgid "Previous version" @@ -1861,6 +1863,10 @@ msgstr "" msgid "find.material_type_not_patriarche_complete_label" msgstr "" +#: templates/sheet_ope_modif.html:178 +msgid "No find associated to this operation" +msgstr "Pas de mobilier associé à cette opération" + #: templates/sheet_operation.html:33 msgid "Associated file:" msgstr "Dossier associé :" @@ -1883,11 +1889,12 @@ msgstr "Unité d'Enregistrement" #: templates/sheet_operation.html:142 msgid "No context record associated to parcel " -msgstr "Pas d'Unité d'Enregistrement associée à ce dossier" +msgstr "Pas d'Unité d'Enregistrement associée à la parcelle " #: templates/sheet_operation.html:145 msgid "No context record associated to this operation (no parcel)" -msgstr "Pas d'Unité d'Enregistrement associée à ce dossier (pas de parcelle)" +msgstr "" +"Pas d'Unité d'Enregistrement associée à cette opération (pas de parcelle)" #: templates/sheet_operation.html:183 msgid "No find associated to context record" @@ -1905,6 +1912,10 @@ msgstr "(pas d'Unité d'Enregistrement)" msgid "No find associated to this operation (no parcel)" msgstr "Pas de mobilier associé à cette opération (pas de parcelle)" +#: templates/towns_wizard.html:33 +msgid "No town set in the associated file." +msgstr "" + #: templates/wizard_done.html:4 msgid "Item successfully saved" msgstr "Élément enregistré avec succès" diff --git a/ishtar/templates/sheet_contextrecord.html b/ishtar/templates/sheet_contextrecord.html index b29541d54..13c11bd5b 100644 --- a/ishtar/templates/sheet_contextrecord.html +++ b/ishtar/templates/sheet_contextrecord.html @@ -129,7 +129,7 @@ {#<a href="#" onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#} </tr> {% empty %} - <tr><td colspan="9" class='no_items'>{% trans "No find associated to this operation" %}</td></tr> + <tr><td colspan="9" class='no_items'>{% trans "No find associated to this context record" %}</td></tr> {% endfor %} </table> diff --git a/ishtar/templates/towns_wizard.html b/ishtar/templates/towns_wizard.html new file mode 100644 index 000000000..115ac9838 --- /dev/null +++ b/ishtar/templates/towns_wizard.html @@ -0,0 +1,40 @@ +{% extends "default_wizard.html" %} +{% load i18n %} +{% load range %} +{% block extra_head %} +{{form.media}} +{% endblock %} +{% block content %} +<form action="." method="post" name='wizard'>{% csrf_token %} +<ul id='form_path'> +{% for step in previous_steps %} + <li>» <button name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li> +{% endfor %} + <li class='current'>» <a href='#'>{{current_step.form_label}}</a></li> +</ul> +<div class='form'> +{% if extra_context.TOWNS %} +{% if form.forms %} +<div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div> +<table class='formset'> + {%if form.non_form_errors%}<tr class='error'><th colspan='2'>{{form.non_form_errors}}</th></tr>{%endif%} + {{ form.management_form }} + {% for formsetform in form.forms %} + {{ formsetform.as_table }} + {% endfor %} + <tr class='modify'><td colspan="2"><button name="formset_modify" value="{{form_step}}">{% trans "Add/Modify" %}</button></td></tr></li> +</table> +{% else %} +<table> + {{ form.as_table }} +</table> +{% endif %} +{% else %} +<p class='alert'>{% trans "No town set in the associated file." %}</p> +{% endif %} +<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> +{{ previous_fields|safe }} +<input type="submit" id="submit_form" value="{% trans "Validate" %}"/> +</div> +</form> +{% endblock %} |