Manage search key translations

1 files changed, 14 insertions, 4 deletions

diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 7e64a90eb..828df91e5 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -27,7 +27,8 @@ from django.db import IntegrityError, transaction
 from django.db.models import Q, Count, Sum, Max, Avg
 from django.db.models.signals import post_save, m2m_changed, post_delete
 from django.forms import ValidationError
-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.models import BaseHistorizedItem, Dashboard, \
     DashboardFormItem, Department, Document, DocumentTemplate, \
@@ -177,7 +178,10 @@ class ArchaeologicalSite(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()
 
     reference = models.CharField(_(u"Reference"), max_length=200, unique=True)
     name = models.CharField(_(u"Name"), max_length=200,
@@ -603,7 +607,10 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         ),
     }
     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()
 
     POST_PROCESS_REQUEST = {
         'towns__numero_insee__startswith': '_get_department_code',
@@ -1514,7 +1521,10 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
         ),
     }
     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()
 
     POST_PROCESS_REQUEST = {
         'operation__towns__numero_insee__startswith': '_get_department_code',