diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 22b90842c..8bab21360 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -52,7 +52,8 @@ from django.db.utils import DatabaseError from django.template.defaultfilters import slugify from django.utils.functional import lazy from django.utils.safestring import SafeUnicode, mark_safe -from django.utils.translation import ugettext_lazy as _, ugettext, pgettext_lazy +from django.utils.translation import ugettext_lazy as _, ugettext, \ + pgettext_lazy, activate, deactivate from secretary import Renderer as SecretaryRenderer from simple_history.models import HistoricalRecords as BaseHistoricalRecords from unidecode import unidecode @@ -2528,7 +2529,10 @@ class Organization(Address, Merge, 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() # fields name = models.CharField(_(u"Name"), max_length=500) @@ -2672,7 +2676,10 @@ class Person(Address, Merge, 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() # fields old_title = models.CharField(_(u"Title"), max_length=100, choices=TYPE, @@ -3039,7 +3046,10 @@ class IshtarUser(FullSearch): ), } 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 user_ptr = models.OneToOneField(User, primary_key=True, @@ -3329,7 +3339,10 @@ class Document(OwnPerms, ImageModel, FullSearch, Imported): ), } 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() title = models.TextField(_(u"Title"), blank=True, default='') associated_file = models.FileField( |