Manage search key translations

1 files changed, 10 insertions, 3 deletions

diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 0b578755f..8dcb1c700 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -24,7 +24,8 @@ from django.contrib.gis.db import models
 from django.db.models import Q
 from django.db.models.signals import post_save, post_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 ishtar_common.data_importer import post_importer_action
 from ishtar_common.models import Document, GeneralType, get_external_id, \
@@ -64,7 +65,10 @@ class Warehouse(Address, DashboardFormItem, 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()
 
     name = models.CharField(_(u"Name"), max_length=200)
     warehouse_type = models.ForeignKey(WarehouseType,
@@ -329,7 +333,10 @@ class Container(LightHistorizedItem, ImageModel):
         ),
     }
     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
     location = models.ForeignKey(