1 files changed, 13 insertions, 18 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index d2faebc1e..d2337db81 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -34,7 +34,7 @@ from ishtar_common.models import Document, GeneralType, \
     GeneralRelationType, GeneralRecordRelations, post_delete_record_relation,\
     post_save_cache, ValueGetter, BulkUpdatedItem, ExternalIdManager, \
     RelationItem, Town, get_current_profile, document_attached_changed, \
-    HistoryModel
+    HistoryModel, SearchAltName
 from archaeological_operations.models import Operation, Period, Parcel, \
     ArchaeologicalSite
 
@@ -321,60 +321,55 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
                              'cr_relation_types': ''}
     # alternative names of fields for searches
     ALT_NAMES = {
-        'label': (
+        'label': SearchAltName(
             pgettext_lazy("key for text search", u"id"),
             'label__iexact'
         ),
-        'town': (
+        'town': SearchAltName(
             pgettext_lazy("key for text search", u"town"),
             'town__cached_label__iexact'
         ),
-        'operation__year': (
+        'operation__year': SearchAltName(
             pgettext_lazy("key for text search", u"operation-year"),
             'operation__year'
         ),
-        'operation__code_patriarche': (
+        'operation__code_patriarche': SearchAltName(
             pgettext_lazy("key for text search", u"patriarche"),
             'operation__code_patriarche__iexact'
         ),
-        'operation__operation_code': (
+        'operation__operation_code': SearchAltName(
             pgettext_lazy("key for text search", u"operation-code"),
             'operation__operation_code'
         ),
-        'operation__cached_label': (
+        'operation__cached_label': SearchAltName(
             pgettext_lazy("key for text search", u"operation"),
             'operation__cached_label__icontains'
         ),
-        'archaeological_site': (
+        'archaeological_site': SearchAltName(
             pgettext_lazy("key for text search", u"site"),
             'archaeological_site__cached_label__icontains'
         ),
-        'ope_relation_types': (
+        'ope_relation_types': SearchAltName(
             pgettext_lazy("key for text search", u"operation-relation-type"),
             'ope_relation_types'
         ),
-        'datings__period': (
+        'datings__period': SearchAltName(
             pgettext_lazy("key for text search", u"period"),
             'datings__period__label__iexact'
         ),
-        'unit': (
+        'unit': SearchAltName(
             pgettext_lazy("key for text search", u"unit-type"),
             'unit__label__iexact'
         ),
-        'parcel': (
+        'parcel': SearchAltName(
             pgettext_lazy("key for text search", u"parcel"),
             'parcel__cached_label__iexact'
         ),
-        'cr_relation_types': (
+        'cr_relation_types': SearchAltName(
             pgettext_lazy("key for text search", u"record-relation-type"),
             'cr_relation_types'
         ),
     }
-    for v in ALT_NAMES.values():
-        for language_code, language_lbl in settings.LANGUAGES:
-            activate(language_code)
-            EXTRA_REQUEST_KEYS[unicode(v[0])] = v[1]
-            deactivate()
 
     PARENT_ONLY_SEARCH_VECTORS = ['operation', "archaeological_site"]
     BASE_SEARCH_VECTORS = ["cached_label", "label", "location", "town__name",