diff --git a/mayan/apps/document_states/__init__.py b/mayan/apps/document_states/__init__.py index cc54b663ef..99962fb99c 100644 --- a/mayan/apps/document_states/__init__.py +++ b/mayan/apps/document_states/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db.models.signals import post_save from django.dispatch import receiver -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from common.utils import encapsulate from documents.models import Document diff --git a/mayan/apps/document_states/models.py b/mayan/apps/document_states/models.py index b610fa404b..2998639fc5 100644 --- a/mayan/apps/document_states/models.py +++ b/mayan/apps/document_states/models.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.db import models from django.utils.encoding import python_2_unicode_compatible -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from documents.models import Document, DocumentType diff --git a/mayan/apps/dynamic_search/models.py b/mayan/apps/dynamic_search/models.py index bddca5e547..b8554ff696 100644 --- a/mayan/apps/dynamic_search/models.py +++ b/mayan/apps/dynamic_search/models.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.db import models from django.utils.encoding import smart_str, smart_unicode -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from .managers import RecentSearchManager diff --git a/mayan/apps/dynamic_search/templatetags/search_tags.py b/mayan/apps/dynamic_search/templatetags/search_tags.py index 395b7cf095..452514384e 100644 --- a/mayan/apps/dynamic_search/templatetags/search_tags.py +++ b/mayan/apps/dynamic_search/templatetags/search_tags.py @@ -2,11 +2,11 @@ from __future__ import unicode_literals from django.core.urlresolvers import reverse from django.template import Library -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ -from dynamic_search.forms import SearchForm -from dynamic_search.models import RecentSearch -from dynamic_search.settings import RECENT_COUNT +from ..forms import SearchForm +from ..models import RecentSearch +from ..settings import RECENT_COUNT register = Library() diff --git a/mayan/apps/events/classes.py b/mayan/apps/events/classes.py index dd47b4c5ac..47fa8d5340 100644 --- a/mayan/apps/events/classes.py +++ b/mayan/apps/events/classes.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django.db import models -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from actstream import action diff --git a/mayan/apps/folders/models.py b/mayan/apps/folders/models.py index 3218d10da8..58d586eaa6 100644 --- a/mayan/apps/folders/models.py +++ b/mayan/apps/folders/models.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import User from django.db import models -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from documents.models import Document diff --git a/mayan/apps/folders/templatetags/folder_tags.py b/mayan/apps/folders/templatetags/folder_tags.py index e03a9b417f..f32ac4672e 100644 --- a/mayan/apps/folders/templatetags/folder_tags.py +++ b/mayan/apps/folders/templatetags/folder_tags.py @@ -1,7 +1,7 @@ from django.core.urlresolvers import reverse from django.template import Library -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from folders.forms import AddDocumentForm diff --git a/mayan/apps/mailer/forms.py b/mayan/apps/mailer/forms.py index b9fce99998..f02b2f1aa6 100644 --- a/mayan/apps/mailer/forms.py +++ b/mayan/apps/mailer/forms.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django import forms -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from .settings import ( DOCUMENT_BODY_TEMPLATE, DOCUMENT_SUBJECT_TEMPLATE, LINK_BODY_TEMPLATE, diff --git a/mayan/apps/navigation/forms.py b/mayan/apps/navigation/forms.py index 7dd16fce4c..77c2b51502 100644 --- a/mayan/apps/navigation/forms.py +++ b/mayan/apps/navigation/forms.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django import forms -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from .links import link_spacer diff --git a/mayan/apps/ocr/api.py b/mayan/apps/ocr/api.py index 2e67d09efe..3fa345e987 100644 --- a/mayan/apps/ocr/api.py +++ b/mayan/apps/ocr/api.py @@ -6,7 +6,7 @@ import tempfile import sh -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from common.settings import TEMPORARY_DIRECTORY from common.utils import fs_cleanup, load_backend diff --git a/mayan/apps/ocr/parsers/__init__.py b/mayan/apps/ocr/parsers/__init__.py index 2ae6a16d3a..9987fff432 100644 --- a/mayan/apps/ocr/parsers/__init__.py +++ b/mayan/apps/ocr/parsers/__init__.py @@ -6,7 +6,7 @@ import slate import subprocess import tempfile -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from common.settings import TEMPORARY_DIRECTORY from common.utils import copyfile