diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/locale/django.pot | 891 | ||||
| -rw-r--r-- | ishtar_common/models.py | 11 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 14 |
3 files changed, 521 insertions, 395 deletions
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index b3ceeddda..ba75c5e2f 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -20,125 +20,125 @@ msgstr "" msgid "Related item" msgstr "" -#: context_processors.py:37 +#: context_processors.py:38 msgid "Archaeological file" msgstr "" -#: context_processors.py:38 models.py:1322 +#: context_processors.py:39 models.py:1434 msgid "Operation" msgstr "" -#: context_processors.py:40 +#: context_processors.py:41 msgid "Context record" msgstr "" -#: context_processors.py:42 +#: context_processors.py:43 msgid "Find" msgstr "" -#: data_importer.py:181 +#: data_importer.py:182 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: data_importer.py:198 +#: data_importer.py:199 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: data_importer.py:210 +#: data_importer.py:211 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: data_importer.py:223 data_importer.py:236 data_importer.py:479 +#: data_importer.py:224 data_importer.py:238 data_importer.py:482 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: data_importer.py:248 +#: data_importer.py:251 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: data_importer.py:299 data_importer.py:540 +#: data_importer.py:302 data_importer.py:545 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: data_importer.py:306 +#: data_importer.py:309 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: data_importer.py:309 +#: data_importer.py:312 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: data_importer.py:503 +#: data_importer.py:508 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: data_importer.py:615 +#: data_importer.py:620 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: data_importer.py:619 +#: data_importer.py:624 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: data_importer.py:621 +#: data_importer.py:626 msgid "No data provided" msgstr "" -#: data_importer.py:622 +#: data_importer.py:627 msgid "Value is required" msgstr "" -#: data_importer.py:623 +#: data_importer.py:628 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: data_importer.py:624 +#: data_importer.py:629 msgid "The regexp doesn't match." msgstr "" -#: data_importer.py:1032 +#: data_importer.py:1037 msgid "Not imported" msgstr "" -#: data_importer.py:1408 +#: data_importer.py:1441 msgid "line" msgstr "" -#: data_importer.py:1408 +#: data_importer.py:1441 msgid "col" msgstr "" -#: data_importer.py:1408 +#: data_importer.py:1441 msgid "error" msgstr "" -#: data_importer.py:1414 +#: data_importer.py:1447 msgid "field" msgstr "" -#: data_importer.py:1414 +#: data_importer.py:1447 msgid "source" msgstr "" -#: data_importer.py:1414 +#: data_importer.py:1447 msgid "result" msgstr "" -#: data_importer.py:1430 +#: data_importer.py:1463 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -147,7 +147,7 @@ msgstr "" msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "" -#: forms.py:71 forms_common.py:441 +#: forms.py:71 forms_common.py:489 msgid "Confirm" msgstr "" @@ -163,22 +163,22 @@ msgstr "" msgid "Closing date" msgstr "" -#: forms.py:130 +#: forms.py:137 msgid "You should select an item." msgstr "" -#: forms.py:131 +#: forms.py:138 msgid "Add a new item" msgstr "" -#: forms.py:174 models.py:1099 +#: forms.py:204 models.py:1211 msgid "Template" msgstr "" #: forms_common.py:39 forms_common.py:57 forms_common.py:169 -#: forms_common.py:289 models.py:1165 models.py:2420 +#: forms_common.py:292 models.py:1277 models.py:2555 #: templates/blocks/JQueryAdvancedTown.html:19 -#: templates/ishtar/sheet_organization.html:17 +#: templates/ishtar/sheet_organization.html:13 msgid "Town" msgstr "" @@ -192,269 +192,281 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: forms_common.py:66 forms_common.py:669 ishtar_menu.py:42 models.py:1320 -#: models.py:2119 models.py:2248 models.py:2302 +#: forms_common.py:66 forms_common.py:717 ishtar_menu.py:47 models.py:1432 +#: models.py:2232 models.py:2379 models.py:2436 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" -#: forms_common.py:157 forms_common.py:231 ishtar_menu.py:66 models.py:1321 -#: models.py:2036 templates/ishtar/sheet_organization.html:6 +#: forms_common.py:157 forms_common.py:233 forms_common.py:335 +#: ishtar_menu.py:71 models.py:1433 models.py:2149 +#: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" -#: forms_common.py:160 forms_common.py:196 forms_common.py:226 -#: forms_common.py:259 models.py:812 models.py:1098 models.py:1366 -#: models.py:1584 models.py:2030 models.py:2106 models.py:2406 -#: templates/ishtar/sheet_organization.html:12 -#: templates/ishtar/sheet_organization.html:25 +#: forms_common.py:160 forms_common.py:196 forms_common.py:228 +#: forms_common.py:262 forms_common.py:330 models.py:886 models.py:1210 +#: models.py:1478 models.py:1696 models.py:2143 models.py:2219 models.py:2541 +#: templates/ishtar/sheet_organization.html:8 +#: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:161 models.py:1307 models.py:1715 +#: forms_common.py:161 models.py:1419 models.py:1827 msgid "Organization type" msgstr "" -#: forms_common.py:163 forms_common.py:283 models.py:1160 -#: templates/ishtar/sheet_organization.html:14 +#: forms_common.py:163 forms_common.py:286 models.py:1272 +#: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:165 forms_common.py:286 models.py:1161 -#: templates/ishtar/sheet_organization.html:15 +#: forms_common.py:165 forms_common.py:289 models.py:1273 +#: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:167 forms_common.py:287 models.py:1163 -#: templates/ishtar/sheet_organization.html:16 +#: forms_common.py:167 forms_common.py:290 models.py:1275 +#: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:170 forms_common.py:290 models.py:1166 +#: forms_common.py:170 forms_common.py:293 models.py:1278 msgid "Country" msgstr "" -#: forms_common.py:172 forms_common.py:228 forms_common.py:263 -#: forms_common.py:397 models.py:1193 +#: forms_common.py:172 forms_common.py:230 forms_common.py:266 +#: forms_common.py:332 forms_common.py:445 models.py:1305 msgid "Email" msgstr "" -#: forms_common.py:173 forms_common.py:266 models.py:1178 -#: templates/ishtar/sheet_organization.html:18 -#: templates/ishtar/sheet_person.html:19 +#: forms_common.py:173 forms_common.py:269 models.py:1290 +#: templates/ishtar/sheet_organization.html:14 +#: templates/ishtar/sheet_person.html:18 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:174 forms_common.py:275 models.py:1190 -#: templates/ishtar/sheet_organization.html:19 -#: templates/ishtar/sheet_person.html:37 +#: forms_common.py:174 forms_common.py:278 models.py:1302 +#: templates/ishtar/sheet_organization.html:15 +#: templates/ishtar/sheet_person.html:36 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:197 forms_common.py:229 models.py:1741 models.py:2032 -#: models.py:2343 templates/sheet_ope.html:85 templates/sheet_ope.html.py:105 -#: templates/sheet_ope.html:126 templates/ishtar/import_list.html:13 -#: templates/ishtar/sheet_organization.html:27 -#: templates/ishtar/sheet_person.html:91 +#: forms_common.py:197 forms_common.py:231 forms_common.py:333 models.py:1854 +#: models.py:2145 models.py:2477 templates/sheet_ope.html:85 +#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 +#: templates/ishtar/import_list.html:13 +#: templates/ishtar/sheet_organization.html:23 #: templates/ishtar/blocks/window_tables/documents.html:6 msgid "Type" msgstr "" -#: forms_common.py:206 views.py:128 +#: forms_common.py:206 views.py:130 msgid "Organization search" msgstr "" -#: forms_common.py:227 forms_common.py:257 models.py:2104 -#: templates/ishtar/sheet_organization.html:26 +#: forms_common.py:229 forms_common.py:260 forms_common.py:331 models.py:2217 +#: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" -#: forms_common.py:243 views.py:93 +#: forms_common.py:245 forms_common.py:318 views.py:95 msgid "Person search" msgstr "" -#: forms_common.py:254 templates/ishtar/sheet_person.html:8 +#: forms_common.py:257 templates/ishtar/sheet_person.html:7 #: templates/ishtar/wizard/wizard_person.html:6 msgid "Identity" msgstr "" -#: forms_common.py:256 forms_common.py:595 forms_common.py:636 models.py:2102 -#: models.py:2340 templates/sheet_ope.html:104 -#: templates/ishtar/sheet_person.html:90 +#: forms_common.py:259 forms_common.py:643 forms_common.py:684 models.py:2215 +#: models.py:2474 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:5 msgid "Title" msgstr "" -#: forms_common.py:261 models.py:2108 +#: forms_common.py:264 models.py:2221 msgid "Raw name" msgstr "" -#: forms_common.py:264 models.py:1179 +#: forms_common.py:267 models.py:1291 msgid "Phone description" msgstr "" -#: forms_common.py:267 models.py:1181 models.py:1183 +#: forms_common.py:270 models.py:1293 models.py:1295 msgid "Phone description 2" msgstr "" -#: forms_common.py:269 +#: forms_common.py:272 msgid "Phone 2" msgstr "" -#: forms_common.py:271 models.py:1187 +#: forms_common.py:274 models.py:1299 msgid "Phone description 3" msgstr "" -#: forms_common.py:273 models.py:1185 +#: forms_common.py:276 models.py:1297 msgid "Phone 3" msgstr "" -#: forms_common.py:278 +#: forms_common.py:281 msgid "Current organization" msgstr "" -#: forms_common.py:292 models.py:1168 +#: forms_common.py:295 models.py:1280 msgid "Other address: address" msgstr "" -#: forms_common.py:295 models.py:1171 +#: forms_common.py:298 models.py:1283 msgid "Other address: address complement" msgstr "" -#: forms_common.py:297 models.py:1172 +#: forms_common.py:300 models.py:1284 msgid "Other address: postal code" msgstr "" -#: forms_common.py:299 models.py:1174 +#: forms_common.py:302 models.py:1286 msgid "Other address: town" msgstr "" -#: forms_common.py:301 models.py:1176 +#: forms_common.py:304 models.py:1288 msgid "Other address: country" msgstr "" -#: forms_common.py:346 forms_common.py:376 forms_common.py:380 models.py:2084 +#: forms_common.py:314 +msgid "Already has an account" +msgstr "" + +#: forms_common.py:329 +msgid "Username" +msgstr "" + +#: forms_common.py:347 +msgid "Account search" +msgstr "" + +#: forms_common.py:394 forms_common.py:424 forms_common.py:428 models.py:2197 msgid "Person type" msgstr "" -#: forms_common.py:391 forms_common.py:396 +#: forms_common.py:439 forms_common.py:444 ishtar_menu.py:32 msgid "Account" msgstr "" -#: forms_common.py:400 wizards.py:1158 +#: forms_common.py:448 wizards.py:1170 msgid "New password" msgstr "" -#: forms_common.py:403 +#: forms_common.py:451 msgid "New password (confirmation)" msgstr "" -#: forms_common.py:422 +#: forms_common.py:470 msgid "Your password and confirmation password do not match." msgstr "" -#: forms_common.py:427 +#: forms_common.py:475 msgid "You must provide a correct password." msgstr "" -#: forms_common.py:435 +#: forms_common.py:483 msgid "This username already exists." msgstr "" -#: forms_common.py:442 +#: forms_common.py:490 msgid "Send the new password by email?" msgstr "" -#: forms_common.py:451 forms_common.py:464 models.py:2421 +#: forms_common.py:499 forms_common.py:512 models.py:2556 msgid "Towns" msgstr "" -#: forms_common.py:461 +#: forms_common.py:509 msgid "There are identical towns." msgstr "" -#: forms_common.py:545 +#: forms_common.py:593 msgid "Only one choice can be checked." msgstr "" -#: forms_common.py:593 +#: forms_common.py:641 msgid "Documentation informations" msgstr "" -#: forms_common.py:597 forms_common.py:637 models.py:1716 models.py:2323 +#: forms_common.py:645 forms_common.py:685 models.py:1828 models.py:2457 msgid "Source type" msgstr "" -#: forms_common.py:599 forms_common.py:638 templates/sheet_ope.html:84 +#: forms_common.py:647 forms_common.py:686 templates/sheet_ope.html:84 msgid "Reference" msgstr "" -#: forms_common.py:602 forms_common.py:639 +#: forms_common.py:650 forms_common.py:687 msgid "Internal reference" msgstr "" -#: forms_common.py:605 models.py:2354 +#: forms_common.py:653 models.py:2488 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:606 models.py:2356 +#: forms_common.py:654 models.py:2490 msgid "Receipt date" msgstr "" -#: forms_common.py:608 models.py:1868 models.py:2358 +#: forms_common.py:656 models.py:1981 models.py:2492 msgid "Creation date" msgstr "" -#: forms_common.py:611 models.py:2361 +#: forms_common.py:659 models.py:2495 msgid "Receipt date in documentation" msgstr "" -#: forms_common.py:613 forms_common.py:641 models.py:282 models.py:490 -#: models.py:1611 models.py:2112 models.py:2368 +#: forms_common.py:661 forms_common.py:689 models.py:287 models.py:516 +#: models.py:1723 models.py:2225 models.py:2502 msgid "Comment" msgstr "" -#: forms_common.py:615 forms_common.py:640 models.py:814 models.py:1370 -#: models.py:1543 models.py:1585 models.py:2367 templates/sheet_ope.html:128 +#: forms_common.py:663 forms_common.py:688 models.py:888 models.py:1482 +#: models.py:1655 models.py:1697 models.py:2501 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:618 models.py:2369 +#: forms_common.py:666 models.py:2503 msgid "Additional information" msgstr "" -#: forms_common.py:620 forms_common.py:644 models.py:2371 +#: forms_common.py:668 forms_common.py:692 models.py:2505 msgid "Has a duplicate" msgstr "" -#: forms_common.py:633 forms_common.py:662 forms_common.py:695 models.py:2307 +#: forms_common.py:681 forms_common.py:710 forms_common.py:743 models.py:2441 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" -#: forms_common.py:643 +#: forms_common.py:691 msgid "Additional informations" msgstr "" -#: forms_common.py:654 +#: forms_common.py:702 msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:670 models.py:1717 models.py:2297 models.py:2304 +#: forms_common.py:718 models.py:1829 models.py:2431 models.py:2438 msgid "Author type" msgstr "" -#: forms_common.py:688 +#: forms_common.py:736 msgid "Author selection" msgstr "" -#: forms_common.py:702 +#: forms_common.py:750 msgid "There are identical authors." msgstr "" -#: forms_common.py:706 models.py:2308 models.py:2350 +#: forms_common.py:754 models.py:2442 models.py:2484 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Authors" @@ -464,52 +476,56 @@ msgstr "" msgid "Administration" msgstr "" -#: ishtar_menu.py:31 views.py:154 -msgid "Account management" +#: ishtar_menu.py:33 +msgid "Add/modify" msgstr "" -#: ishtar_menu.py:34 models.py:894 views.py:1140 +#: ishtar_menu.py:36 +msgid "Deletion" +msgstr "" + +#: ishtar_menu.py:39 models.py:1006 views.py:1232 msgid "Global variables" msgstr "" -#: ishtar_menu.py:39 +#: ishtar_menu.py:44 msgid "Directory" msgstr "" -#: ishtar_menu.py:45 ishtar_menu.py:69 templates/blocks/JQueryJqGrid.html:3 +#: ishtar_menu.py:50 ishtar_menu.py:74 templates/blocks/JQueryJqGrid.html:3 msgid "Search" msgstr "" -#: ishtar_menu.py:49 ishtar_menu.py:74 templates/ishtar/import_list.html:15 +#: ishtar_menu.py:54 ishtar_menu.py:79 templates/ishtar/import_list.html:15 msgid "Creation" msgstr "" -#: ishtar_menu.py:53 ishtar_menu.py:79 +#: ishtar_menu.py:58 ishtar_menu.py:84 msgid "Modification" msgstr "" -#: ishtar_menu.py:57 ishtar_menu.py:84 templates/ishtar/merge.html:5 +#: ishtar_menu.py:62 ishtar_menu.py:89 templates/ishtar/merge.html:5 msgid "Merge" msgstr "" -#: ishtar_menu.py:61 ishtar_menu.py:88 models.py:1905 widgets.py:110 +#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2018 widgets.py:110 #: templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: ishtar_menu.py:96 models.py:1879 +#: ishtar_menu.py:101 models.py:1992 msgid "Imports" msgstr "" -#: ishtar_menu.py:99 views.py:1148 +#: ishtar_menu.py:104 views.py:1240 msgid "New import" msgstr "" -#: ishtar_menu.py:103 views.py:1162 +#: ishtar_menu.py:108 views.py:1254 msgid "Current imports" msgstr "" -#: ishtar_menu.py:107 +#: ishtar_menu.py:112 msgid "Old imports" msgstr "" @@ -525,692 +541,770 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:278 models.py:489 models.py:1133 models.py:1145 +#: models.py:283 models.py:515 models.py:1245 models.py:1257 msgid "Label" msgstr "" -#: models.py:280 +#: models.py:285 msgid "Textual ID" msgstr "" -#: models.py:283 models.py:492 models.py:1102 +#: models.py:288 models.py:518 models.py:1214 msgid "Available" msgstr "" -#: models.py:511 models.py:1657 +#: models.py:537 models.py:1769 msgid "Key" msgstr "" -#: models.py:517 +#: models.py:543 msgid "Specific key to an import" msgstr "" -#: models.py:593 +#: models.py:623 msgid "Last editor" msgstr "" -#: models.py:596 +#: models.py:626 msgid "Creator" msgstr "" -#: models.py:729 models.py:2432 +#: models.py:766 models.py:2567 msgid "Order" msgstr "" -#: models.py:730 +#: models.py:767 msgid "Symmetrical" msgstr "" -#: models.py:743 +#: models.py:768 +msgid "Tiny label" +msgstr "" + +#: models.py:782 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:813 models.py:1368 +#: models.py:880 +msgid "Euro" +msgstr "" + +#: models.py:881 +msgid "US dollar" +msgstr "" + +#: models.py:887 models.py:1480 msgid "Slug" msgstr "" -#: models.py:815 +#: models.py:889 msgid "Files module" msgstr "" -#: models.py:816 +#: models.py:890 msgid "Context records module" msgstr "" -#: models.py:818 +#: models.py:892 msgid "Finds module" msgstr "" -#: models.py:819 +#: models.py:893 msgid "Need context records module" msgstr "" -#: models.py:821 +#: models.py:895 msgid "Warehouses module" msgstr "" -#: models.py:822 +#: models.py:896 msgid "Need finds module" msgstr "" -#: models.py:824 +#: models.py:898 msgid "Home page" msgstr "" -#: models.py:825 +#: models.py:899 msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax." msgstr "" -#: models.py:827 +#: models.py:902 +msgid "File external id" +msgstr "" + +#: models.py:904 +msgid "" +"Formula to manage file external ID. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:909 +msgid "Parcel external id" +msgstr "" + +#: models.py:912 +msgid "" +"Formula to manage parcel external ID. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:917 +msgid "Context record external id" +msgstr "" + +#: models.py:919 +msgid "" +"Formula to manage context record external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:924 +msgid "Base find external id" +msgstr "" + +#: models.py:926 +msgid "" +"Formula to manage base find external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:931 +msgid "Find external id" +msgstr "" + +#: models.py:933 +msgid "" +"Formula to manage find external ID. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:937 msgid "Current active" msgstr "" -#: models.py:830 +#: models.py:938 +msgid "Currency" +msgstr "" + +#: models.py:942 msgid "Ishtar site profile" msgstr "" -#: models.py:831 +#: models.py:943 msgid "Ishtar site profiles" msgstr "" -#: models.py:887 +#: models.py:999 msgid "Variable name" msgstr "" -#: models.py:888 +#: models.py:1000 msgid "Description of the variable" msgstr "" -#: models.py:890 models.py:1658 +#: models.py:1002 models.py:1770 msgid "Value" msgstr "" -#: models.py:893 +#: models.py:1005 msgid "Global variable" msgstr "" -#: models.py:1003 models.py:1033 +#: models.py:1115 models.py:1145 msgid "Total" msgstr "" -#: models.py:1010 models.py:1134 models.py:1146 -#: templates/ishtar/sheet_person.html:22 +#: models.py:1122 models.py:1246 models.py:1258 +#: templates/ishtar/sheet_person.html:21 #: templates/ishtar/dashboards/dashboard_main_detail.html:135 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 #: templates/ishtar/wizard/wizard_person.html:20 msgid "Number" msgstr "" -#: models.py:1097 +#: models.py:1209 msgid "Administrative Act" msgstr "" -#: models.py:1101 +#: models.py:1213 msgid "Associated object" msgstr "" -#: models.py:1105 +#: models.py:1217 msgid "Document template" msgstr "" -#: models.py:1106 +#: models.py:1218 msgid "Document templates" msgstr "" -#: models.py:1137 models.py:1147 models.py:1863 +#: models.py:1249 models.py:1259 models.py:1976 msgid "State" msgstr "" -#: models.py:1151 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1263 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1152 +#: models.py:1264 msgid "Departments" msgstr "" -#: models.py:1189 +#: models.py:1301 msgid "Raw phone" msgstr "" -#: models.py:1195 +#: models.py:1307 msgid "Alternative address is prefered" msgstr "" -#: models.py:1234 +#: models.py:1346 msgid "Tel: " msgstr "" -#: models.py:1238 +#: models.py:1350 msgid "Mobile: " msgstr "" -#: models.py:1242 +#: models.py:1354 msgid "Email: " msgstr "" -#: models.py:1247 +#: models.py:1359 msgid "Merge key" msgstr "" -#: models.py:1308 +#: models.py:1420 msgid "Organization types" msgstr "" -#: models.py:1324 +#: models.py:1436 msgid "Archaeological site" msgstr "" -#: models.py:1325 +#: models.py:1437 msgid "Parcels" msgstr "" -#: models.py:1327 +#: models.py:1439 msgid "Operation source" msgstr "" -#: models.py:1330 views.py:965 views.py:1016 +#: models.py:1442 views.py:1057 views.py:1108 msgid "Archaeological files" msgstr "" -#: models.py:1332 views.py:968 views.py:1024 +#: models.py:1444 views.py:1060 views.py:1116 msgid "Context records" msgstr "" -#: models.py:1334 +#: models.py:1446 msgid "Context record relations" msgstr "" -#: models.py:1336 views.py:970 views.py:1027 +#: models.py:1448 views.py:1062 views.py:1119 msgid "Finds" msgstr "" -#: models.py:1372 templates/ishtar/dashboards/dashboard_main.html:26 +#: models.py:1484 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "" -#: models.py:1374 +#: models.py:1486 msgid "Associated model" msgstr "" -#: models.py:1377 +#: models.py:1489 msgid "Is template" msgstr "" -#: models.py:1378 +#: models.py:1490 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1382 +#: models.py:1494 msgid "Importer - Type" msgstr "" -#: models.py:1383 +#: models.py:1495 msgid "Importer - Types" msgstr "" -#: models.py:1473 +#: models.py:1585 msgid "Importer - Default" msgstr "" -#: models.py:1474 +#: models.py:1586 msgid "Importer - Defaults" msgstr "" -#: models.py:1509 +#: models.py:1621 msgid "Importer - Default value" msgstr "" -#: models.py:1510 +#: models.py:1622 msgid "Importer - Default values" msgstr "" -#: models.py:1542 +#: models.py:1654 msgid "Column number" msgstr "" -#: models.py:1545 +#: models.py:1657 msgid "Required" msgstr "" -#: models.py:1548 +#: models.py:1660 msgid "Importer - Column" msgstr "" -#: models.py:1549 +#: models.py:1661 msgid "Importer - Columns" msgstr "" -#: models.py:1569 +#: models.py:1681 msgid "Field name" msgstr "" -#: models.py:1571 models.py:1605 +#: models.py:1683 models.py:1717 msgid "Force creation of new items" msgstr "" -#: models.py:1573 models.py:1607 +#: models.py:1685 models.py:1719 msgid "Concatenate with existing" msgstr "" -#: models.py:1575 models.py:1609 +#: models.py:1687 models.py:1721 msgid "Concatenate character" msgstr "" -#: models.py:1579 +#: models.py:1691 msgid "Importer - Duplicate field" msgstr "" -#: models.py:1580 +#: models.py:1692 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:1587 +#: models.py:1699 msgid "Regular expression" msgstr "" -#: models.py:1590 +#: models.py:1702 msgid "Importer - Regular expression" msgstr "" -#: models.py:1591 +#: models.py:1703 msgid "Importer - Regular expressions" msgstr "" -#: models.py:1614 +#: models.py:1726 msgid "Importer - Target" msgstr "" -#: models.py:1615 +#: models.py:1727 msgid "Importer - Targets" msgstr "" -#: models.py:1639 views.py:325 +#: models.py:1751 views.py:343 msgid "True" msgstr "" -#: models.py:1640 views.py:327 +#: models.py:1752 views.py:345 msgid "False" msgstr "" -#: models.py:1659 +#: models.py:1771 msgid "Is set" msgstr "" -#: models.py:1666 +#: models.py:1778 msgid "Importer - Target key" msgstr "" -#: models.py:1667 +#: models.py:1779 msgid "Importer - Targets keys" msgstr "" -#: models.py:1718 models.py:2335 models.py:2346 +#: models.py:1830 models.py:2469 models.py:2480 msgid "Format" msgstr "" -#: models.py:1719 models.py:2436 +#: models.py:1831 models.py:2571 msgid "Operation type" msgstr "" -#: models.py:1720 +#: models.py:1832 msgid "Period" msgstr "" -#: models.py:1721 +#: models.py:1833 +msgid "Report state" +msgstr "" + +#: models.py:1834 msgid "Unit" msgstr "" -#: models.py:1722 +#: models.py:1835 msgid "Material" msgstr "" -#: models.py:1724 +#: models.py:1837 msgid "Conservatory state" msgstr "" -#: models.py:1725 +#: models.py:1838 msgid "Preservation type" msgstr "" -#: models.py:1726 +#: models.py:1839 msgid "Object type" msgstr "" -#: models.py:1728 +#: models.py:1841 msgid "Identification type" msgstr "" -#: models.py:1730 +#: models.py:1843 msgid "Context record relation type" msgstr "" -#: models.py:1731 models.py:2329 +#: models.py:1844 models.py:2463 msgid "Support type" msgstr "" -#: models.py:1737 +#: models.py:1850 msgid "Integer" msgstr "" -#: models.py:1738 +#: models.py:1851 msgid "Float" msgstr "" -#: models.py:1739 +#: models.py:1852 msgid "String" msgstr "" -#: models.py:1740 templates/sheet_ope.html:86 +#: models.py:1853 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:1742 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 -#: templates/ishtar/sheet_person.html:89 +#: models.py:1855 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:120 msgid "Year" msgstr "" -#: models.py:1743 +#: models.py:1856 msgid "String to boolean" msgstr "" -#: models.py:1744 +#: models.py:1857 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:1745 +#: models.py:1858 msgid "Unknow type" msgstr "" -#: models.py:1761 +#: models.py:1874 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:1762 +#: models.py:1875 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:1763 +#: models.py:1876 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:1773 +#: models.py:1886 msgid "Options" msgstr "" -#: models.py:1775 +#: models.py:1888 msgid "Split character(s)" msgstr "" -#: models.py:1779 +#: models.py:1892 msgid "Importer - Formater type" msgstr "" -#: models.py:1780 +#: models.py:1893 msgid "Importer - Formater types" msgstr "" -#: models.py:1827 templates/ishtar/dashboards/dashboard_main_detail.html:61 +#: models.py:1940 templates/ishtar/dashboards/dashboard_main_detail.html:61 msgid "Created" msgstr "" -#: models.py:1828 +#: models.py:1941 msgid "Analyse in progress" msgstr "" -#: models.py:1829 +#: models.py:1942 msgid "Analysed" msgstr "" -#: models.py:1830 +#: models.py:1943 msgid "Import pending" msgstr "" -#: models.py:1831 +#: models.py:1944 msgid "Import in progress" msgstr "" -#: models.py:1832 +#: models.py:1945 msgid "Finished with errors" msgstr "" -#: models.py:1833 +#: models.py:1946 msgid "Finished" msgstr "" -#: models.py:1834 +#: models.py:1947 msgid "Archived" msgstr "" -#: models.py:1846 +#: models.py:1959 msgid "Imported file" msgstr "" -#: models.py:1849 +#: models.py:1962 msgid "Associated images (zip file)" msgstr "" -#: models.py:1851 +#: models.py:1964 msgid "Encoding" msgstr "" -#: models.py:1853 +#: models.py:1966 msgid "Skip lines" msgstr "" -#: models.py:1854 templates/ishtar/import_list.html:47 +#: models.py:1967 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "" -#: models.py:1857 +#: models.py:1970 msgid "Result file" msgstr "" -#: models.py:1860 templates/ishtar/import_list.html:53 +#: models.py:1973 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "" -#: models.py:1866 +#: models.py:1979 msgid "Conservative import" msgstr "" -#: models.py:1871 +#: models.py:1984 msgid "End date" msgstr "" -#: models.py:1873 +#: models.py:1986 msgid "Remaining seconds" msgstr "" -#: models.py:1878 +#: models.py:1991 msgid "Import" msgstr "" -#: models.py:1895 +#: models.py:2008 msgid "Analyse" msgstr "" -#: models.py:1897 models.py:1900 +#: models.py:2010 models.py:2013 msgid "Re-analyse" msgstr "" -#: models.py:1898 +#: models.py:2011 msgid "Launch import" msgstr "" -#: models.py:1901 +#: models.py:2014 msgid "Re-import" msgstr "" -#: models.py:1902 +#: models.py:2015 msgid "Archive" msgstr "" -#: models.py:1904 +#: models.py:2017 msgid "Unarchive" msgstr "" -#: models.py:2037 +#: models.py:2150 msgid "Organizations" msgstr "" -#: models.py:2039 +#: models.py:2152 msgid "Can view all Organizations" msgstr "" -#: models.py:2040 +#: models.py:2153 msgid "Can view own Organization" msgstr "" -#: models.py:2041 +#: models.py:2154 msgid "Can add own Organization" msgstr "" -#: models.py:2043 +#: models.py:2156 msgid "Can change own Organization" msgstr "" -#: models.py:2045 +#: models.py:2158 msgid "Can delete own Organization" msgstr "" -#: models.py:2080 +#: models.py:2193 msgid "Groups" msgstr "" -#: models.py:2085 +#: models.py:2198 msgid "Person types" msgstr "" -#: models.py:2092 +#: models.py:2205 msgid "Mr" msgstr "" -#: models.py:2093 +#: models.py:2206 msgid "Miss" msgstr "" -#: models.py:2094 +#: models.py:2207 msgid "Mr and Mrs" msgstr "" -#: models.py:2095 +#: models.py:2208 msgid "Mrs" msgstr "" -#: models.py:2096 +#: models.py:2209 msgid "Doctor" msgstr "" -#: models.py:2110 +#: models.py:2223 msgid "Contact type" msgstr "" -#: models.py:2113 models.py:2160 +#: models.py:2226 models.py:2273 msgid "Types" msgstr "" -#: models.py:2116 +#: models.py:2229 msgid "Is attached to" msgstr "" -#: models.py:2120 +#: models.py:2233 msgid "Persons" msgstr "" -#: models.py:2122 +#: models.py:2235 msgid "Can view all Persons" msgstr "" -#: models.py:2123 +#: models.py:2236 msgid "Can view own Person" msgstr "" -#: models.py:2124 +#: models.py:2237 msgid "Can add own Person" msgstr "" -#: models.py:2125 +#: models.py:2238 msgid "Can change own Person" msgstr "" -#: models.py:2126 +#: models.py:2239 msgid "Can delete own Person" msgstr "" -#: models.py:2252 +#: models.py:2383 msgid "Ishtar user" msgstr "" -#: models.py:2253 +#: models.py:2384 msgid "Ishtar users" msgstr "" -#: models.py:2298 +#: models.py:2426 +msgid "To modify the password use the form in Auth > User" +msgstr "" + +#: models.py:2432 msgid "Author types" msgstr "" -#: models.py:2324 +#: models.py:2458 msgid "Source types" msgstr "" -#: models.py:2330 +#: models.py:2464 msgid "Support types" msgstr "" -#: models.py:2336 +#: models.py:2470 msgid "Formats" msgstr "" -#: models.py:2341 +#: models.py:2475 msgid "External ID" msgstr "" -#: models.py:2344 +#: models.py:2478 msgid "Support" msgstr "" -#: models.py:2348 +#: models.py:2482 msgid "Scale" msgstr "" -#: models.py:2362 +#: models.py:2496 msgid "Item number" msgstr "" -#: models.py:2363 +#: models.py:2497 msgid "Ref." msgstr "" -#: models.py:2366 +#: models.py:2500 msgid "Internal ref." msgstr "" -#: models.py:2407 +#: models.py:2542 msgid "Surface (m2)" msgstr "" -#: models.py:2408 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2543 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2433 +#: models.py:2568 msgid "Is preventive" msgstr "" -#: models.py:2437 +#: models.py:2572 msgid "Operation types" msgstr "" -#: models.py:2463 +#: models.py:2598 msgid "Preventive" msgstr "" -#: models.py:2464 +#: models.py:2599 msgid "Research" msgstr "" @@ -1218,86 +1312,88 @@ msgstr "" msgid " (...)" msgstr "" -#: views.py:100 +#: views.py:102 msgid "New person" msgstr "" -#: views.py:108 +#: views.py:110 msgid "Person modification" msgstr "" -#: views.py:123 +#: views.py:125 msgid "Person deletion" msgstr "" -#: views.py:134 +#: views.py:136 msgid "New organization" msgstr "" -#: views.py:141 +#: views.py:143 msgid "Organization modification" msgstr "" -#: views.py:147 +#: views.py:159 msgid "Organization deletion" msgstr "" -#: views.py:662 templates/base.html:81 templates/ishtar/basket_list.html:4 -#: templates/ishtar/sheet_organization.html:35 -#: templatetags/link_to_window.py:18 -msgid "Details" +#: views.py:166 +msgid "Account management" msgstr "" -#: views.py:893 views.py:947 +#: views.py:172 +msgid "Account deletion" +msgstr "" + +#: views.py:970 views.py:1039 msgid "Operation not permitted." msgstr "" -#: views.py:895 +#: views.py:972 #, python-format msgid "New %s" msgstr "" -#: views.py:966 views.py:1020 +#: views.py:1058 views.py:1112 msgid "Operations" msgstr "" -#: views.py:1209 templates/ishtar/import_list.html:43 +#: views.py:1301 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "" -#: views.py:1224 +#: views.py:1316 msgid "Delete import" msgstr "" -#: views.py:1283 views.py:1299 +#: views.py:1375 views.py:1391 msgid "Corporation manager" msgstr "" -#: widgets.py:237 widgets.py:345 widgets.py:461 +#: widgets.py:239 widgets.py:347 widgets.py:463 msgid "Search..." msgstr "" -#: widgets.py:604 templatetags/window_tables.py:71 +#: widgets.py:608 templatetags/window_tables.py:76 msgid "No results" msgstr "" -#: widgets.py:605 templatetags/window_tables.py:72 +#: widgets.py:609 templatetags/window_tables.py:77 msgid "Loading..." msgstr "" -#: widgets.py:606 +#: widgets.py:610 msgid "Remove" msgstr "" -#: wizards.py:318 templates/ishtar/import_delete.html:20 +#: wizards.py:321 templates/ishtar/import_delete.html:20 msgid "Yes" msgstr "" -#: wizards.py:320 +#: wizards.py:323 msgid "No" msgstr "" -#: wizards.py:1215 +#: wizards.py:1227 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" @@ -1336,29 +1432,29 @@ msgstr "" msgid "The %(app_name)s team" msgstr "" -#: templates/base.html:35 +#: templates/base.html:36 msgid "Logged in" msgstr "" -#: templates/base.html:36 +#: templates/base.html:37 msgid "Log out" msgstr "" -#: templates/base.html:37 +#: templates/base.html:38 msgid "Change password" msgstr "" -#: templates/base.html:39 templates/registration/activate.html:10 +#: templates/base.html:40 templates/registration/activate.html:10 #: templates/registration/login.html:8 templates/registration/login.html:10 #: templates/registration/password_reset_complete.html:8 msgid "Log in" msgstr "" -#: templates/base.html:45 +#: templates/base.html:46 msgid "Lang" msgstr "" -#: templates/base.html:45 templates/base.html.py:92 templates/welcome.html:7 +#: templates/base.html:46 templates/base.html.py:93 templates/welcome.html:7 #: templates/welcome.html.py:8 templates/welcome.html:9 #: templates/welcome.html.py:10 templates/ishtar/manage_basket.html:4 #: templates/ishtar/blocks/window_field.html:1 @@ -1368,26 +1464,23 @@ msgstr "" msgid ":" msgstr "" -#: templates/base.html:70 +#: templates/base.html:71 msgid "Default selected items" msgstr "" -#: templates/base.html:90 +#: templates/base.html:91 msgid "Current items" msgstr "" -#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10 -#: templates/ishtar/sheet_toolbar.html:1 +#: templates/sheet_ope.html:4 msgid "Export as:" msgstr "" -#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10 -#: templates/ishtar/sheet_toolbar.html:1 +#: templates/sheet_ope.html:4 msgid "OpenOffice.org file" msgstr "" -#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10 -#: templates/ishtar/sheet_toolbar.html:1 +#: templates/sheet_ope.html:4 msgid "PDF file" msgstr "" @@ -1575,7 +1668,7 @@ msgstr "" msgid "Documentation" msgstr "" -#: templates/sheet_ope.html:102 templates/ishtar/sheet_person.html:87 +#: templates/sheet_ope.html:102 msgid "Documents" msgstr "" @@ -1669,24 +1762,29 @@ msgstr "" msgid "Search and select an item" msgstr "" -#: templates/blocks/JQueryJqGrid.html:16 templates/blocks/JQueryJqGrid.html:20 +#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20 #: templates/ishtar/blocks/window_tables/dynamic_documents.html:9 -#: templates/ishtar/blocks/window_tables/dynamic_documents.html:13 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:12 msgid "Export as CSV" msgstr "" -#: templates/blocks/JQueryJqGrid.html:17 +#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9 +msgid "CSV" +msgstr "" + +#: templates/blocks/JQueryJqGrid.html:18 #: templates/ishtar/blocks/window_tables/dynamic_documents.html:10 -msgid "simple" +msgid "Export as CSV - full" msgstr "" #: templates/blocks/JQueryJqGrid.html:18 -#: templates/ishtar/blocks/window_tables/dynamic_documents.html:11 -msgid "full" +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10 +msgid "CSV full" msgstr "" #: templates/blocks/JQueryJqGrid.html:96 -#: templates/ishtar/blocks/window_tables/dynamic_documents.html:42 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41 msgid "An error as occured during search. Check your query fields." msgstr "" @@ -1806,6 +1904,7 @@ msgstr "" #: templates/ishtar/organization_person_form.html:32 #: templates/ishtar/person_form.html:43 #: templates/ishtar/blocks/modify_toolbar.html:1 +#: templates/ishtar/blocks/window_nav.html:39 msgid "Modify" msgstr "" @@ -1837,84 +1936,112 @@ msgstr "" msgid "Contact informations" msgstr "" -#: templates/ishtar/sheet.html:21 -msgid "Previous" -msgstr "" - -#: templates/ishtar/sheet.html:22 +#: templates/ishtar/sheet.html:28 msgid "Close" msgstr "" -#: templates/ishtar/sheet.html:23 +#: templates/ishtar/sheet.html:34 msgid "Close all windows" msgstr "" -#: templates/ishtar/sheet.html:24 -msgid "Next" -msgstr "" - -#: templates/ishtar/sheet_organization.html:13 +#: templates/ishtar/sheet_organization.html:9 msgid "Created by:" msgstr "" -#: templates/ishtar/sheet_organization.html:23 +#: templates/ishtar/sheet_organization.html:19 msgid "Person in the organization" msgstr "" -#: templates/ishtar/sheet_organization.html:38 +#: templates/ishtar/sheet_organization.html:34 msgid "No person in this organization" msgstr "" -#: templates/ishtar/sheet_person.html:21 +#: templates/ishtar/sheet_person.html:20 #: templates/ishtar/wizard/wizard_person.html:19 msgid "Phone type" msgstr "" -#: templates/ishtar/sheet_person.html:44 +#: templates/ishtar/sheet_person.html:43 #: templates/ishtar/wizard/wizard_person.html:42 msgid "Business address" msgstr "" -#: templates/ishtar/sheet_person.html:52 +#: templates/ishtar/sheet_person.html:51 #: templates/ishtar/wizard/wizard_person.html:51 msgid "Other address" msgstr "" -#: templates/ishtar/sheet_person.html:60 +#: templates/ishtar/sheet_person.html:59 msgid "Associated organization" msgstr "" -#: templates/ishtar/sheet_person.html:71 +#: templates/ishtar/sheet_person.html:70 msgid "Associated operations as scientist" msgstr "" -#: templates/ishtar/sheet_person.html:75 +#: templates/ishtar/sheet_person.html:74 msgid "Associated operations as responsible" msgstr "" -#: templates/ishtar/sheet_person.html:81 +#: templates/ishtar/sheet_person.html:80 msgid "Associated archaelogical files" msgstr "" -#: templates/ishtar/sheet_person.html:92 -#: templates/ishtar/sheet_person.html:100 -#: templates/ishtar/blocks/window_tables/documents.html:9 -#: templates/ishtar/blocks/window_tables/documents.html:17 -msgid "Link" +#: templates/ishtar/sheet_person.html:86 +msgid "Documents associated to operations" +msgstr "" + +#: templates/ishtar/sheet_person.html:91 +msgid "Documents associated to context records" msgstr "" -#: templates/ishtar/sheet_person.html:104 -msgid "No document associated to this person" +#: templates/ishtar/sheet_person.html:96 +msgid "Documents associated to finds" msgstr "" #: templates/ishtar/blocks/window_field_url.html:2 msgid "link" msgstr "" +#: templates/ishtar/blocks/window_nav.html:6 +msgid "Previous version" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:17 +msgid "Restore this version" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:17 +msgid "" +"Are you sure to restore to this version? All changement made since this " +"version will be lost." +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:22 +msgid "Restore" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:24 +msgid "Next version" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:45 +msgid "Export as OpenOffice.org file" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:45 +msgid "Export as PDF file" +msgstr "" + #: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Related to" msgstr "" +#: templates/ishtar/blocks/window_tables/documents.html:9 +#: templates/ishtar/blocks/window_tables/documents.html:17 +msgid "Link" +msgstr "" + #: templates/ishtar/dashboards/dashboard_main_detail.html:5 msgid "Numbers" msgstr "" @@ -2067,26 +2194,6 @@ msgstr "" msgid "Associated persons" msgstr "" -#: templates/ishtar/wizard/wizard_organization_deletion.html:9 -#: templates/ishtar/wizard/wizard_organization_deletion.html:17 -#: templates/ishtar/wizard/wizard_organization_deletion.html:25 -#: templates/ishtar/wizard/wizard_organization_deletion.html:33 -#: templates/ishtar/wizard/wizard_person_deletion.html:9 -#: templates/ishtar/wizard/wizard_person_deletion.html:17 -#: templates/ishtar/wizard/wizard_person_deletion.html:25 -#: templates/ishtar/wizard/wizard_person_deletion.html:33 -#: templates/ishtar/wizard/wizard_person_deletion.html:41 -#: templates/ishtar/wizard/wizard_person_deletion.html:49 -#: templates/ishtar/wizard/wizard_person_deletion.html:57 -#: templates/ishtar/wizard/wizard_person_deletion.html:65 -#: templates/ishtar/wizard/wizard_person_deletion.html:73 -#: templates/ishtar/wizard/wizard_person_deletion.html:81 -#: templates/ishtar/wizard/wizard_person_deletion.html:98 -#: templates/ishtar/wizard/wizard_person_deletion.html:101 -#: templates/ishtar/wizard/wizard_person_deletion.html:111 -msgid "show" -msgstr "" - #: templates/ishtar/wizard/wizard_organization_deletion.html:14 msgid "Associated archaeological files" msgstr "" diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a1cc3cc1b..51cb16157 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -258,9 +258,9 @@ class Cached(object): slug_field = 'txt_idx' @classmethod - def get_cache(cls, slug): + def get_cache(cls, slug, force=False): cache_key, value = get_cache(cls, slug) - if value: + if not force and value: return value try: k = {cls.slug_field: slug} @@ -270,8 +270,13 @@ class Cached(object): except cls.DoesNotExist: return None + def save(self, *args, **kwargs): + ret = super(Cached, self).save(*args, **kwargs) + self.get_cache(getattr(self, self.slug_field), force=True) + return ret + -class GeneralType(models.Model, Cached): +class GeneralType(Cached, models.Model): """ Abstract class for "types" """ diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index b779af221..5add2e2cf 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -140,6 +140,20 @@ class WizardTest(object): self.post_wizard() +class CacheTest(TestCase): + def testAdd(self): + cached = models.OrganizationType.get_cache('test') + self.assertEqual(cached, None) + orga = models.OrganizationType.objects.create( + txt_idx='test', label='testy') + cached = models.OrganizationType.get_cache('test') + self.assertEqual(cached.pk, orga.pk) + orga.txt_idx = 'testy' + orga.save() + cached = models.OrganizationType.get_cache('testy') + self.assertEqual(cached.pk, orga.pk) + + class MergeTest(TestCase): def setUp(self): self.user, created = User.objects.get_or_create(username='username') |