From 3ab60ea85ee7a05bdef719f5e155f917d1eb37e0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 2 May 2017 10:29:54 +0200 Subject: Revert "Move translation strings" This reverts commit 4204e06da0db0654b66bc766006f4143603c2695. --- ishtar_common/__init__.py | 9 ++++++++- ishtar_common/models.py | 11 ----------- requirements.txt | 1 - 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ishtar_common/__init__.py b/ishtar_common/__init__.py index 496fe6c68..2b432d908 100644 --- a/ishtar_common/__init__.py +++ b/ishtar_common/__init__.py @@ -1,3 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2014-2017 Étienne Loks +# Copyright (C) 2014-2015 Étienne Loks + +from django.utils.translation import ugettext_lazy as _ + +# overload of translation of registration module +_(u"username") +_(u"email address") +_(u"Related item") diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e25b0777b..5912c8377 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -72,17 +72,6 @@ from ishtar_common.data_importer import Importer, ImportFormater, \ logger = logging.getLogger(__name__) -def lazy_translations(): - """ - This function is never called. Only a container for translations, - not reached on first evaluation of the module. - There must be a cleaner way to do that... - """ - _(u"username") - _(u"email address") - _(u"Related item") - - def post_save_user(sender, **kwargs): user = kwargs['instance'] diff --git a/requirements.txt b/requirements.txt index 93c935c88..98122296f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,6 @@ pytidylib==0.2.1 lxml==3.4.0 html5lib==0.999 -secretary==0.2.14 django-extra-views==0.2.4 beautifulsoup4==4.3.2 markdown==2.5.1 -- cgit v1.2.3