From 5d0750488690ec698857aa40e4e16761d3aae613 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Aug 2018 18:18:05 +0200 Subject: Manage search key translations --- archaeological_finds/models_finds.py | 8 ++++++-- archaeological_finds/models_treatments.py | 13 ++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'archaeological_finds') diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 889138c7f..0fb8229e4 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -27,7 +27,8 @@ from django.db.models import Max, Q from django.db.models.signals import m2m_changed, post_save, post_delete, \ pre_delete from django.core.exceptions import ObjectDoesNotExist -from django.utils.translation import ugettext_lazy as _, pgettext_lazy +from django.utils.translation import ugettext_lazy as _, pgettext_lazy, \ + activate, deactivate from ishtar_common.data_importer import post_importer_action, ImporterError from ishtar_common.utils import cached_label_changed, post_save_point @@ -839,7 +840,10 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, ), } for v in ALT_NAMES.values(): - EXTRA_REQUEST_KEYS[v[0]] = v[1] + for language_code, language_lbl in settings.LANGUAGES: + activate(language_code) + EXTRA_REQUEST_KEYS[unicode(v[0])] = v[1] + deactivate() # fields base_finds = models.ManyToManyField(BaseFind, verbose_name=_(u"Base find"), diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 4549fdc69..2bc02288b 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -24,7 +24,8 @@ from django.contrib.gis.db import models from django.db.models import Max, Q from django.db.models.signals import post_save, post_delete, pre_delete from django.template.defaultfilters import slugify -from django.utils.translation import ugettext_lazy as _, pgettext_lazy +from django.utils.translation import ugettext_lazy as _, pgettext_lazy, \ + activate, deactivate from archaeological_finds.models_finds import Find, FindBasket, TreatmentType from archaeological_operations.models import ClosedItem, Operation @@ -98,7 +99,10 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem, ), } for v in ALT_NAMES.values(): - EXTRA_REQUEST_KEYS[v[0]] = v[1] + for language_code, language_lbl in settings.LANGUAGES: + activate(language_code) + EXTRA_REQUEST_KEYS[unicode(v[0])] = v[1] + deactivate() BASE_SEARCH_VECTORS = [ 'treatment_types__label', 'treatment_state__label', 'label', 'goal', @@ -562,7 +566,10 @@ class TreatmentFile(DashboardFormItem, ClosedItem, BaseHistorizedItem, ), } for v in ALT_NAMES.values(): - EXTRA_REQUEST_KEYS[v[0]] = v[1] + for language_code, language_lbl in settings.LANGUAGES: + activate(language_code) + EXTRA_REQUEST_KEYS[unicode(v[0])] = v[1] + deactivate() # fields year = models.IntegerField(_(u"Year"), default=get_current_year) -- cgit v1.2.3