Changeset 5055

Timestamp:

04/21/07 09:16:21 (2 years ago)

Author:

mtredinnick

Message:

unicode: Added ugettext(), ungettext() and *_lazy() versions of same.

Files:

• django/branches/unicode/django/utils/translation/__init__.py (modified) (2 diffs)
• django/branches/unicode/django/utils/translation/trans_null.py (modified) (3 diffs)
• django/branches/unicode/django/utils/translation/trans_real.py (modified) (5 diffs)

django/branches/unicode/django/utils/translation/__init__.py

@@ -8 +8 @@
-        'get_language', 'get_language_bidi', 'get_date_formats',
-        'get_partial_date_formats', 'check_for_language', 'to_locale',
-
+
+
-
-# Here be dragons, so a short explanation of the logic won't hurt:
@@ -49 +50 @@
-    return real_gettext_noop(message)
-
+ugettext_noop = gettext_noop
+
-def gettext(message):
-    return real_gettext(message)
-
-
-def ngettext(singular, plural, number):
-    return real_ngettext(singular, plural, number)
-
+def ugettext(message):
+    return real_ugettext(message)
+
+def ungettext(singular, plural, number):
+    return real_ungettext(singular, plural, number)
+
-def string_concat(*strings):
-    return real_string_concat(*strings)
-
-
-
+
+
+
+
-string_concat = lazy(string_concat, str, unicode)
-

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

@@ -4 +4 @@
-
-from django.conf import settings
+from django.utils.encoding import smart_unicode
-
-def ngettext(singular, plural, number):
@@ -9 +10 @@
-    return plural
-ngettext_lazy = ngettext
+
+def ungettext(singular, plural, number):
+    return smart_unicode(ngettext(singular, plural, number))
-
-string_concat = lambda *strings: ''.join([str(el) for el in strings])
@@ -31 +35 @@
-    return TECHNICAL_ID_MAP.get(message, message)
-
+def ugettext(message):
+    return smart_unicode(gettext(message))
+
-gettext_noop = gettext_lazy = _ = gettext
-

django/branches/unicode/django/utils/translation/trans_real.py

@@ -4 +4 @@
-import gettext as gettext_module
-from cStringIO import StringIO
+from django.utils.encoding import smart_str, smart_unicode
-
-try:
@@ -58 +59 @@
-        # identical with the translation file charset.
-        try:
-settings.DEFAULT_CHARSET
+'utf-8'
-        except AttributeError:
-            pass
-settings.DEFAULT_CHARSET
+'utf-8'
-        self.__language = '??'
-
@@ -239 +240 @@
-    return _default
-
+def do_translate(message, translation_function):
+    """
+    Translate 'message' using the given 'translation_function' name -- which
+    will be either gettext or ugettext.
+    """
+    global _default, _active
+    t = _active.get(currentThread(), None)
+    if t is not None:
+        return getattr(t, translation_function)(message)
+    if _default is None:
+        from django.conf import settings
+        _default = translation(settings.LANGUAGE_CODE)
+    return getattr(_default, translation_function)(message)
+
-def gettext(message):
-    """
@@ -246 +261 @@
-    message will be run through the default translation object.
-    """
+    return do_translate(message, 'gettext')
+
+def ugettext(message):
+    return do_translate(message, 'ugettext')
+
+def gettext_noop(message):
+    """
+    Marks strings for translation but doesn't translate them now. This can be
+    used to store strings in global variables that should stay in the base
+    language (because they might be used externally) and will be translated
+    later.
+    """
+    return message
+
+def do_ntranslate(singular, plural, number, translation_function):
-    global _default, _active
+
-    t = _active.get(currentThread(), None)
-    if t is not None:
-t.gettext(message
+getattr(t, translation_function)(singular, plural, number
-    if _default is None:
-        from django.conf import settings
-        _default = translation(settings.LANGUAGE_CODE)
-
-
-
-
-
-
-
-
-
+
-
-def ngettext(singular, plural, number):
-    """
-the translation of either the singular or plural, based on the number.
-"""
-global _default, _active
-
-
-    if t is not None
-    return t.ngettext(singular, plural, number)
-if _default is None:
-    from django.conf import settings
-    _default = translation(settings.LANGUAGE_CODE)
-_default.ngettext(singular, plural, number
+a UTF-8 bytestring of the translation of either the singular or
+plural, based on the number.
+"""
+
+
+def ungettext(singular, plural, number)
+"""
+Returns a unicode strings of the translation of either the singular or
+plural, based on the number.
+"""
+do_ntranslate(singular, plural, number, 'ungettext'
-
-def check_for_language(lang_code):
-    """
-
-
-
+
+
+
+
-    """
-    from django.conf import settings
@@ -292 +316 @@
-def get_language_from_request(request):
-    """
-
-
-
+
+
+
+
-    """
-    global _accepted