Django

Code

Changeset 5390

Show
Ignore:
Timestamp:
05/31/07 04:51:39 (1 year ago)
Author:
mtredinnick
Message:

unicode: Fixed #4442 -- Fixed a problem with string_concat() when
USE_I18N=False.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/unicode/django/utils/translation/trans_null.py

    r5314 r5390  
    44 
    55from django.conf import settings 
    6 from django.utils.encoding import smart_unicode 
     6from django.utils.encoding import force_unicode 
    77 
    88def ngettext(singular, plural, number): 
    …… 
    1212 
    1313def ungettext(singular, plural, number): 
    14     return smart_unicode(ngettext(singular, plural, number)) 
     14    return force_unicode(ngettext(singular, plural, number)) 
    1515 
    16 string_concat = lambda *strings: u''.join([smart_unicode(el) for el in strings]) 
     16string_concat = lambda *strings: u''.join([force_unicode(el) for el in strings]) 
    1717activate = lambda x: None 
    1818deactivate = deactivate_all = install = lambda: None 
    …… 
    3636 
    3737def ugettext(message): 
    38     return smart_unicode(gettext(message)) 
     38    return force_unicode(gettext(message)) 
    3939 
    4040gettext_noop = gettext_lazy = _ = gettext