From 797c1d2a858bce0ae728c7bb2274e5b9a5b2423e Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Thu, 31 May 2007 09:51:39 +0000 Subject: [PATCH] unicode: Fixed #4442 -- Fixed a problem with string_concat() when USE_I18N=False. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5390 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/translation/trans_null.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py index c6fe16d37f..e3f89567a5 100644 --- a/django/utils/translation/trans_null.py +++ b/django/utils/translation/trans_null.py @@ -3,7 +3,7 @@ # settings.USE_I18N = False can use this module rather than trans_real.py. from django.conf import settings -from django.utils.encoding import smart_unicode +from django.utils.encoding import force_unicode def ngettext(singular, plural, number): if number == 1: return singular @@ -11,9 +11,9 @@ def ngettext(singular, plural, number): ngettext_lazy = ngettext def ungettext(singular, plural, number): - return smart_unicode(ngettext(singular, plural, number)) + return force_unicode(ngettext(singular, plural, number)) -string_concat = lambda *strings: u''.join([smart_unicode(el) for el in strings]) +string_concat = lambda *strings: u''.join([force_unicode(el) for el in strings]) activate = lambda x: None deactivate = deactivate_all = install = lambda: None get_language = lambda: settings.LANGUAGE_CODE @@ -35,7 +35,7 @@ def gettext(message): return TECHNICAL_ID_MAP.get(message, message) def ugettext(message): - return smart_unicode(gettext(message)) + return force_unicode(gettext(message)) gettext_noop = gettext_lazy = _ = gettext