1 files changed, 10 insertions, 1 deletions
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():