[Archetypes-checkins] r7339 - in Archetypes/trunk: . generator

[hannosch <svn...@pl...>]

Author: hannosch
Date: Sun Jan  7 01:09:45 2007
New Revision: 7339

Modified:
   Archetypes/trunk/HISTORY.txt
   Archetypes/trunk/generator/i18n.py
Log:
Removed some BBB code in generator/i18n.py.


Modified: Archetypes/trunk/HISTORY.txt
==============================================================================
--- Archetypes/trunk/HISTORY.txt	(original)
+++ Archetypes/trunk/HISTORY.txt	Sun Jan  7 01:09:45 2007
@@ -1,6 +1,9 @@
 1.5.0-a2 - unreleased
 =====================
 
+  * Removed some BBB code in generator/i18n.py.
+    [hannosch]
+
   * Adjusted some code to work better with the CMF 2.1 tools as utilities work.
     [hannosch]
 

Modified: Archetypes/trunk/generator/i18n.py
==============================================================================
--- Archetypes/trunk/generator/i18n.py	(original)
+++ Archetypes/trunk/generator/i18n.py	Sun Jan  7 01:09:45 2007
@@ -18,15 +18,9 @@
 def translate_wrapper(domain, msgid, mapping=None, context=None,
                       target_language=None, default=None):
     """Wrapper for calling the translate() method with a fallback value."""
-
-    if hasattr(service, 'utranslate'):
-        res = service.utranslate(domain, msgid, mapping=mapping, context=context,
-                                 target_language=target_language,
-                                 default=default)
-    else:
-        res = service.translate(domain, msgid, mapping=mapping, context=context,
-                                target_language=target_language,
-                                default=default)
+    res = service.translate(domain, msgid, mapping=mapping, context=context,
+                            target_language=target_language,
+                            default=default)
 
     if res is None or res is msgid:
         return default