diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/locale/django.pot | 365 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 168 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 11 |
3 files changed, 449 insertions, 95 deletions
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 477245316..4ab3f237f 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -5,6 +5,7 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata msgid "" msgstr "" @@ -756,15 +757,78 @@ msgid "Types of report state" msgstr "" #: models.py:91 -#| msgid "Record quality" msgid "Type of record quality" msgstr "" #: models.py:92 -#| msgid "Types of report state" msgid "Types of record quality" msgstr "" +#: models.py:126 +msgctxt "key for text search" +msgid "reference" +msgstr "" + +#: models.py:130 models.py:485 +msgctxt "key for text search" +msgid "name" +msgstr "" + +#: models.py:134 models.py:517 tests.py:1594 +msgctxt "key for text search" +msgid "period" +msgstr "" + +#: models.py:138 models.py:513 tests.py:1625 +msgctxt "key for text search" +msgid "remain" +msgstr "" + +#: models.py:142 models.py:473 tests.py:1602 +msgctxt "key for text search" +msgid "town" +msgstr "" + +#: models.py:146 models.py:541 +msgctxt "key for text search" +msgid "comment" +msgstr "" + +#: models.py:150 +msgctxt "key for text search" +msgid "locality-ngi" +msgstr "" + +#: models.py:154 +msgctxt "key for text search" +msgid "locality-cadastral" +msgstr "" + +#: models.py:158 +msgctxt "key for text search" +msgid "shipwreck-name" +msgstr "" + +#: models.py:163 +msgctxt "key for text search" +msgid "oceanographic-service-localisation" +msgstr "" + +#: models.py:167 +msgctxt "key for text search" +msgid "shipwreck-code" +msgstr "" + +#: models.py:171 +msgctxt "key for text search" +msgid "sinking-date" +msgstr "" + +#: models.py:175 +msgctxt "key for text search" +msgid "discovery-area" +msgstr "" + #: models.py:193 msgid "Top operation" msgstr "" @@ -833,6 +897,157 @@ msgstr "" msgid "Archaeological sites (reference)" msgstr "" +#: models.py:461 models.py:1376 tests.py:1597 +msgctxt "key for text search" +msgid "year" +msgstr "" + +#: models.py:465 +msgctxt "key for text search" +msgid "operation-code" +msgstr "" + +#: models.py:469 models.py:1388 +msgctxt "key for text search" +msgid "patriarche" +msgstr "" + +#: models.py:477 models.py:1408 +msgctxt "key for text search" +msgid "parcel" +msgstr "" + +#: models.py:481 +msgctxt "key for text search" +msgid "department" +msgstr "" + +#: models.py:489 +msgctxt "key for text search" +msgid "address" +msgstr "" + +#: models.py:493 models.py:1392 +msgctxt "key for text search" +msgid "type" +msgstr "" + +#: models.py:497 tests.py:1630 +msgctxt "key for text search" +msgid "is-open" +msgstr "" + +#: models.py:501 +msgctxt "key for text search" +msgid "in-charge" +msgstr "" + +#: models.py:505 +msgctxt "key for text search" +msgid "scientist" +msgstr "" + +#: models.py:509 +msgctxt "key for text search" +msgid "operator" +msgstr "" + +#: models.py:521 +msgctxt "key for text search" +msgid "start-before" +msgstr "" + +#: models.py:525 +msgctxt "key for text search" +msgid "start-after" +msgstr "" + +#: models.py:529 +msgctxt "key for text search" +msgid "end-before" +msgstr "" + +#: models.py:533 +msgctxt "key for text search" +msgid "end-after" +msgstr "" + +#: models.py:537 +msgctxt "key for text search" +msgid "relation-types" +msgstr "" + +#: models.py:545 +msgctxt "key for text search" +msgid "abstract" +msgstr "" + +#: models.py:550 +msgctxt "key for text search" +msgid "scientific-documentation-comment" +msgstr "" + +#: models.py:554 +msgctxt "key for text search" +msgid "record-quality" +msgstr "" + +#: models.py:559 +msgctxt "key for text search" +msgid "report-processing" +msgstr "" + +#: models.py:564 +#| msgid "Virtual operation" +msgctxt "key for text search" +msgid "virtual-operation" +msgstr "" + +#: models.py:569 +msgctxt "key for text search" +msgid "site" +msgstr "" + +#: models.py:573 models.py:1426 +msgctxt "key for text search" +msgid "created-by" +msgstr "" + +#: models.py:577 models.py:1430 +msgctxt "key for text search" +msgid "modified-by" +msgstr "" + +#: models.py:581 +msgctxt "key for text search" +msgid "documentation-received" +msgstr "" + +#: models.py:585 +msgctxt "key for text search" +msgid "documentation-deadline-before" +msgstr "" + +#: models.py:589 +msgctxt "key for text search" +msgid "documentation-deadline-after" +msgstr "" + +#: models.py:593 +msgctxt "key for text search" +msgid "finds-received" +msgstr "" + +#: models.py:597 +msgctxt "key for text search" +msgid "finds-deadline-before" +msgstr "" + +#: models.py:601 +msgctxt "key for text search" +msgid "finds-deadline-after" +msgstr "" + #: models.py:615 templates/ishtar/sheet_operation.html:57 msgid "Closing date" msgstr "" @@ -954,6 +1169,146 @@ msgstr "" msgid "Ref." msgstr "" +#: models.py:1380 +msgctxt "key for text search" +msgid "index" +msgstr "" + +#: models.py:1384 +msgctxt "key for text search" +msgid "other-ref" +msgstr "" + +#: models.py:1396 +msgctxt "key for text search" +msgid "indexed" +msgstr "" + +#: models.py:1400 +msgctxt "key for text search" +msgid "operation-town" +msgstr "" + +#: models.py:1404 +msgctxt "key for text search" +msgid "file-town" +msgstr "" + +#: models.py:1414 +msgctxt "key for text search" +msgid "operation-department" +msgstr "" + +#: models.py:1418 +msgctxt "key for text search" +msgid "file-department" +msgstr "" + +#: models.py:1422 +msgctxt "key for text search" +msgid "object" +msgstr "" + +#: models.py:1434 +msgctxt "key for text search" +msgid "signature-before" +msgstr "" + +#: models.py:1438 +msgctxt "key for text search" +msgid "signature-after" +msgstr "" + +#: models.py:1442 +msgctxt "key for text search" +msgid "file-name" +msgstr "" + +#: models.py:1446 +msgctxt "key for text search" +msgid "general-contractor" +msgstr "" + +#: models.py:1451 +msgctxt "key for text search" +msgid "general-contractor-organization" +msgstr "" + +#: models.py:1456 +msgctxt "key for text search" +msgid "file-reference" +msgstr "" + +#: models.py:1460 +msgctxt "key for text search" +msgid "file-year" +msgstr "" + +#: models.py:1464 +msgctxt "key for text search" +msgid "file-other-reference" +msgstr "" + +#: models.py:1468 +msgctxt "key for text search" +msgid "file-in-charge" +msgstr "" + +#: models.py:1472 +msgctxt "key for text search" +msgid "file-permit-reference" +msgstr "" + +#: models.py:1476 +msgctxt "key for text search" +msgid "treatment-name" +msgstr "" + +#: models.py:1480 +msgctxt "key for text search" +msgid "treatment-reference" +msgstr "" + +#: models.py:1484 +msgctxt "key for text search" +msgid "treatment-year" +msgstr "" + +#: models.py:1488 +msgctxt "key for text search" +msgid "treatment-index" +msgstr "" + +#: models.py:1492 +msgctxt "key for text search" +msgid "treatment-type" +msgstr "" + +#: models.py:1496 +msgctxt "key for text search" +msgid "treatment-file-name" +msgstr "" + +#: models.py:1500 +msgctxt "key for text search" +msgid "treatment-file-reference" +msgstr "" + +#: models.py:1504 +msgctxt "key for text search" +msgid "treatment-file-year" +msgstr "" + +#: models.py:1508 +msgctxt "key for text search" +msgid "treatment-file-index" +msgstr "" + +#: models.py:1512 +msgctxt "key for text search" +msgid "treatment-file-type" +msgstr "" + #: models.py:1530 msgid "Person in charge of the operation" msgstr "" @@ -1412,15 +1767,15 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: tests.py:512 +#: tests.py:511 msgid "New objects will be created." msgstr "" -#: tests.py:542 +#: tests.py:541 msgid "This line have been already imported." msgstr "" -#: tests.py:578 +#: tests.py:577 msgid "" "The following error(s) has been encountered while parsing the source file:" msgstr "" diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 34a3d2a01..7e64a90eb 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -37,7 +37,7 @@ from ishtar_common.models import BaseHistorizedItem, Dashboard, \ post_delete_record_relation, post_save_cache, RelationItem, \ ShortMenuItem, SourceType, Town, ValueGetter from ishtar_common.utils import cached_label_changed, \ - force_cached_label_changed, mode, TXT_SEARCH_COMMENT + force_cached_label_changed, mode class RemainType(GeneralType): @@ -123,56 +123,56 @@ class ArchaeologicalSite(BaseHistorizedItem): # alternative names of fields for searches ALT_NAMES = { 'reference': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"reference"), + pgettext_lazy("key for text search", u"reference"), 'reference' ), 'name': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"name"), + pgettext_lazy("key for text search", u"name"), 'name' ), 'periods': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"period"), + pgettext_lazy("key for text search", u"period"), 'periods__label__iexact' ), 'remains': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"remain"), + pgettext_lazy("key for text search", u"remain"), 'remains__label__iexact' ), 'towns': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"town"), + pgettext_lazy("key for text search", u"town"), 'towns__cached_label__iexact' ), 'comment': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"comment"), + pgettext_lazy("key for text search", u"comment"), 'comment__icontains' ), 'locality_ngi': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"locality-ngi"), + pgettext_lazy("key for text search", u"locality-ngi"), 'locality_ngi__icontains' ), 'locality_cadastral': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"locality-cadastral"), + pgettext_lazy("key for text search", u"locality-cadastral"), 'locality_cadastral__icontains' ), 'shipwreck_name': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"shipwreck-name"), + pgettext_lazy("key for text search", u"shipwreck-name"), 'shipwreck_name__iexact' ), 'oceanographic_service_localisation': ( - pgettext_lazy(TXT_SEARCH_COMMENT, + pgettext_lazy("key for text search", u"oceanographic-service-localisation"), 'oceanographic_service_localisation__icontains' ), 'shipwreck_code': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"shipwreck-code"), + pgettext_lazy("key for text search", u"shipwreck-code"), 'shipwreck_code__iexact' ), 'sinking_date': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"sinking-date"), + pgettext_lazy("key for text search", u"sinking-date"), 'sinking_date' ), 'discovery_area': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"discovery-area"), + pgettext_lazy("key for text search", u"discovery-area"), 'discovery_area__icontains' ), } @@ -458,147 +458,147 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, # alternative names of fields for searches ALT_NAMES = { 'year': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"year"), + pgettext_lazy("key for text search", u"year"), 'year' ), 'operation_code': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-code"), + pgettext_lazy("key for text search", u"operation-code"), 'operation_code' ), 'code_patriarche': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"patriarche"), + pgettext_lazy("key for text search", u"patriarche"), 'code_patriarche' ), 'towns': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"town"), + pgettext_lazy("key for text search", u"town"), 'towns__cached_label__iexact' ), 'parcel': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"parcel"), + pgettext_lazy("key for text search", u"parcel"), 'parcels__cached_label__iexact' ), 'towns__numero_insee__startswith': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"department"), + pgettext_lazy("key for text search", u"department"), 'towns__numero_insee__startswith' ), 'common_name': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"name"), + pgettext_lazy("key for text search", u"name"), 'common_name__icontains' ), 'address': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"address"), + pgettext_lazy("key for text search", u"address"), 'address__icontains' ), 'operation_type': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"type"), + pgettext_lazy("key for text search", u"type"), 'operation_type__label__iexact' ), 'end_date': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"is-open"), + pgettext_lazy("key for text search", u"is-open"), 'end_date__isnull' ), 'in_charge': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"in-charge"), + pgettext_lazy("key for text search", u"in-charge"), 'in_charge__cached_label__iexact' ), 'scientist': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"scientist"), + pgettext_lazy("key for text search", u"scientist"), 'scientist__cached_label__iexact' ), 'operator': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"operator"), + pgettext_lazy("key for text search", u"operator"), 'operator__cached_label__iexact' ), 'remains': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"remain"), + pgettext_lazy("key for text search", u"remain"), 'remains__label__iexact' ), 'periods': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"period"), + pgettext_lazy("key for text search", u"period"), 'periods__label__iexact' ), 'start_before': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"start-before"), + pgettext_lazy("key for text search", u"start-before"), 'start_date__lte' ), 'start_after': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"start-after"), + pgettext_lazy("key for text search", u"start-after"), 'start_date__gte' ), 'end_before': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"end-before"), + pgettext_lazy("key for text search", u"end-before"), 'excavation_end_date__lte' ), 'end_after': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"end-after"), + pgettext_lazy("key for text search", u"end-after"), 'excavation_end_date__gte' ), 'relation_types': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"relation-types"), + pgettext_lazy("key for text search", u"relation-types"), 'relation_types' ), 'comment': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"comment"), + pgettext_lazy("key for text search", u"comment"), 'comment__icontains' ), 'abstract': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"abstract"), + pgettext_lazy("key for text search", u"abstract"), 'abstract__icontains' ), 'scientific_documentation_comment': ( - pgettext_lazy(TXT_SEARCH_COMMENT, + pgettext_lazy("key for text search", u"scientific-documentation-comment"), 'scientific_documentation_comment__icontains' ), 'record_quality_type': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"record-quality"), + pgettext_lazy("key for text search", u"record-quality"), 'record_quality_type__label__iexact' ), 'report_processing': ( - pgettext_lazy(TXT_SEARCH_COMMENT, + pgettext_lazy("key for text search", u"report-processing"), 'report_processing__label__iexact' ), 'virtual_operation': ( - pgettext_lazy(TXT_SEARCH_COMMENT, - u"virtual_operation"), + pgettext_lazy("key for text search", + u"virtual-operation"), 'virtual_operation' ), 'archaeological_sites': ( - pgettext_lazy(TXT_SEARCH_COMMENT, + pgettext_lazy("key for text search", u"site"), 'archaeological_sites__cached_label__icontains' ), 'history_creator': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"created-by"), + pgettext_lazy("key for text search", u"created-by"), 'history_creator__ishtaruser__person__cached_label__iexact' ), 'history_modifier': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"modified-by"), + pgettext_lazy("key for text search", u"modified-by"), 'history_modifier__ishtaruser__person__cached_label__iexact' ), 'documentation_received': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"documentation-received"), + pgettext_lazy("key for text search", u"documentation-received"), 'documentation_received' ), 'documentation_deadline_before': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"documentation-deadline-before"), + pgettext_lazy("key for text search", u"documentation-deadline-before"), 'documentation_deadline__lte' ), 'documentation_deadline_after': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"documentation-deadline-after"), + pgettext_lazy("key for text search", u"documentation-deadline-after"), 'documentation_deadline__gte' ), 'finds_received': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"finds-received"), + pgettext_lazy("key for text search", u"finds-received"), 'finds_received' ), 'finds_deadline_before': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"finds-deadline-before"), + pgettext_lazy("key for text search", u"finds-deadline-before"), 'finds_deadline__lte' ), 'finds_deadline_after': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"finds-deadline-after"), + pgettext_lazy("key for text search", u"finds-deadline-after"), 'finds_deadline__gte' ), } @@ -1373,143 +1373,143 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter): # alternative names of fields for searches ALT_NAMES = { 'year': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"year"), + pgettext_lazy("key for text search", u"year"), 'signature_date__year' ), 'index': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"index"), + pgettext_lazy("key for text search", u"index"), 'index' ), 'ref_sra': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"other-ref"), + pgettext_lazy("key for text search", u"other-ref"), 'ref_sra__iexact' ), 'operation__code_patriarche': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"patriarche"), + pgettext_lazy("key for text search", u"patriarche"), 'operation__code_patriarche' ), 'act_type': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"type"), + pgettext_lazy("key for text search", u"type"), 'act_type__label__iexact' ), 'indexed': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"indexed"), + pgettext_lazy("key for text search", u"indexed"), 'index__isnull' ), 'operation__towns': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-town"), + pgettext_lazy("key for text search", u"operation-town"), 'operation__towns__cached_label__iexact' ), 'associated_file__towns': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-town"), + pgettext_lazy("key for text search", u"file-town"), 'associated_file__towns__cached_label__iexact' ), 'parcel': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"parcel"), + pgettext_lazy("key for text search", u"parcel"), ('associated_file__parcels__cached_label__iexact', 'operation__parcels__cached_label__iexact', 'operation__associated_file__parcels__cached_label__iexact'), ), 'operation__towns__numero_insee__startswith': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-department"), + pgettext_lazy("key for text search", u"operation-department"), 'operation__towns__numero_insee__startswith' ), 'associated_file__towns__numero_insee__startswith': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-department"), + pgettext_lazy("key for text search", u"file-department"), 'associated_file__towns__numero_insee__startswith' ), 'act_object': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"object"), + pgettext_lazy("key for text search", u"object"), 'act_object__icontains' ), 'history_creator': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"created-by"), + pgettext_lazy("key for text search", u"created-by"), 'history_creator__ishtaruser__person__cached_label__iexact' ), 'history_modifier': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"modified-by"), + pgettext_lazy("key for text search", u"modified-by"), 'history_modifier__ishtaruser__person__cached_label__iexact' ), 'signature_date_before': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"signature-before"), + pgettext_lazy("key for text search", u"signature-before"), 'signature_date__lte' ), 'signature_date_after': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"signature-after"), + pgettext_lazy("key for text search", u"signature-after"), 'signature_date__gte' ), 'associated_file__name': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-name"), + pgettext_lazy("key for text search", u"file-name"), 'associated_file__name__icontains' ), 'associated_file__general_contractor': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"general-contractor"), + pgettext_lazy("key for text search", u"general-contractor"), 'associated_file__general_contractor__cached_label__iexact' ), 'associated_file__general_contractor__attached_to': ( - pgettext_lazy(TXT_SEARCH_COMMENT, + pgettext_lazy("key for text search", u"general-contractor-organization"), 'associated_file__general_contractor__attached_to' '__cached_label__iexact' ), 'associated_file__numeric_reference': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-reference"), + pgettext_lazy("key for text search", u"file-reference"), 'associated_file__numeric_reference' ), 'associated_file__year': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-year"), + pgettext_lazy("key for text search", u"file-year"), 'associated_file__year' ), 'associated_file__internal_reference': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-other-reference"), + pgettext_lazy("key for text search", u"file-other-reference"), 'associated_file__internal_reference__iexact' ), 'associated_file__in_charge': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-in-charge"), + pgettext_lazy("key for text search", u"file-in-charge"), 'associated_file__in_charge__cached_label__iexact' ), 'associated_file__permit_reference': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"file-permit-reference"), + pgettext_lazy("key for text search", u"file-permit-reference"), 'associated_file__permit_reference__iexact' ), 'treatment__name': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-name"), + pgettext_lazy("key for text search", u"treatment-name"), 'treatment__label__icontains' ), 'treatment__other_reference': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-reference"), + pgettext_lazy("key for text search", u"treatment-reference"), 'treatment__other_reference__icontains' ), 'treatment__year': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-year"), + pgettext_lazy("key for text search", u"treatment-year"), 'treatment__year' ), 'treatment__index': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-index"), + pgettext_lazy("key for text search", u"treatment-index"), 'treatment__index' ), 'treatment__treatment_types': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-type"), + pgettext_lazy("key for text search", u"treatment-type"), 'treatment__treatment_types__label__iexact' ), 'treatment_file__name': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-name"), + pgettext_lazy("key for text search", u"treatment-file-name"), 'treatment_file__name__icontains' ), 'treatment_file__internal_reference': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-reference"), + pgettext_lazy("key for text search", u"treatment-file-reference"), 'treatment_file__internal_reference__icontains' ), 'treatment_file__year': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-year"), + pgettext_lazy("key for text search", u"treatment-file-year"), 'treatment_file__year' ), 'treatment_file__index': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-index"), + pgettext_lazy("key for text search", u"treatment-file-index"), 'treatment_file__index' ), 'treatment_file__type': ( - pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-type"), + pgettext_lazy("key for text search", u"treatment-file-type"), 'treatment_file__type__label__iexact' ), } diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 86fbd0d7b..f50e58eaa 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -50,7 +50,6 @@ from archaeological_context_records.models import Unit, ContextRecord from ishtar_common import forms_common from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \ create_superuser, create_user, TestCase, OPERATION_FIXTURES -from ishtar_common.utils import TXT_SEARCH_COMMENT OPERATION_TOWNS_FIXTURES = \ @@ -1592,15 +1591,15 @@ class OperationSearchTest(TestCase, OperationInitTest): villa = models.RemainType.objects.get(txt_idx='villa') ope1.remains.add(villa) - search_period_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"period")) + search_period_q = unicode(pgettext("key for text search", u"period")) self._test_search(c, search_period_q, final_neo.label, 1, "Simple") - search_year_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"year")) + search_year_q = unicode(pgettext("key for text search", u"year")) self._test_search(c, search_year_q, "2042", 1, "Integer") self._test_search(c, search_year_q, '2042";"2020', 2, "Many integer") - search_town_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"town")) + search_town_q = unicode(pgettext("key for text search", u"town")) self._test_search(c, search_town_q, town.cached_label, 1, "String search with parenthesis and minus") @@ -1623,12 +1622,12 @@ class OperationSearchTest(TestCase, OperationInitTest): u'{}*'.format(neo.label[:3]), 2, "Open search") # non hierarchic search - search_remain_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"remain")) + search_remain_q = unicode(pgettext("key for text search", u"remain")) self._test_search(c, search_remain_q, villa.label, 1, "Non hierarchic search") # boolean search - search_open_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"is-open")) + search_open_q = unicode(pgettext("key for text search", u"is-open")) self._test_search(c, search_open_q, u"Yes", 2, "Boolean") def create_relations(self): |