applied remaining part of original patch 045 (slightly modified)

Author: cmeerw

roundup/cgi/TranslationService.py

@@ -47,13 +47,14 @@ class TranslationService(TranslationServiceMixin, i18n.RoundupTranslations):
 
 class NullTranslationService(TranslationServiceMixin,
         i18n.RoundupNullTranslations):
-    def ugettext(self, message):
-        if self._fallback:
-            return self._fallback.ugettext(message)
-        # Sometimes the untranslatable message is a UTF-8 encoded string
-        # (thanks to PageTemplate's internals).
-        message = us2u(message)
-        return message
+    if hasattr(i18n.RoundupNullTranslations, 'ugettext'):
+        def ugettext(self, message):
+            if self._fallback:
+                return self._fallback.ugettext(message)
+            # Sometimes the untranslatable message is a UTF-8 encoded string
+            # (thanks to PageTemplate's internals).
+            message = us2u(message)
+            return message
 
 ### TAL patching
 #

roundup/i18n.py

@@ -203,8 +203,18 @@ def get_translation(language=None, tracker_home=None,
 translation = get_translation()
 # static translation functions
 _ = gettext = translation.gettext
-ugettext = translation.ugettext
+try:
+    # Python 2.
+    ugettext = translation.ugettext
+except AttributeError:
+    # Python 3.
+    ugettext = translation.gettext
 ngettext = translation.ngettext
-ungettext = translation.ungettext
+try:
+    # Python 2.
+    ungettext = translation.ungettext
+except AttributeError:
+    # Python 3.
+    ungettext = translation.ngettext
 
 # vim: set filetype=python sts=4 sw=4 et si :