Overload translation in database

3 files changed, 18 insertions, 3 deletions

diff --git a/ishtar_common/apps.py b/ishtar_common/apps.py
index 56768bc51..41dce9300 100644
--- a/ishtar_common/apps.py
+++ b/ishtar_common/apps.py
@@ -15,6 +15,11 @@ class IshtarAdminSite(AdminSite):
 admin_site = IshtarAdminSite(name='ishtaradmin')
 
 
+class TranslationOverloadConfig(AppConfig):
+    name = "overload_translation"
+    verbose_name = _("Translation - Overload")
+
+
 class ArchaeologicalContextRecordConfig(AppConfig):
     name = 'archaeological_context_records'
     verbose_name = _("Ishtar - Context record")
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index f6ed81f9c..e7f0e9262 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -68,8 +68,9 @@ from django.db.utils import DatabaseError
 from django.template.defaultfilters import slugify
 from django.utils.functional import lazy
 from django.utils.safestring import SafeText, mark_safe
-from django.utils.translation import ugettext_lazy as _, ugettext, \
-    pgettext_lazy, activate, deactivate
+from django.utils.translation import activate, deactivate
+from ishtar_common.utils import ugettext_lazy as _, ugettext, \
+    pgettext_lazy
 from ishtar_common.utils_secretary import IshtarSecretaryRenderer
 from simple_history.models import HistoricalRecords as BaseHistoricalRecords
 from unidecode import unidecode
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index d446a381a..d828e79cd 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -55,10 +55,19 @@ from django.db import models
 from django.http import HttpResponseRedirect
 from django.utils.datastructures import MultiValueDict as BaseMultiValueDict
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _, ugettext
 from django.template.defaultfilters import slugify
 
 
+if settings.USE_TRANSLATION_OVERLOAD:
+    from overload_translation.utils import ugettext_lazy, ugettext, \
+        pgettext_lazy, pgettext
+else:
+    from django.utils.translation import ugettext_lazy, ugettext, \
+        pgettext_lazy, pgettext
+
+_ = ugettext_lazy
+
+
 def dict_to_tuple(dct):
     values = []
     for k, v in dct.items():