[OpenTAL-checkins] opental/OpenPTi18n i18n_handler.py

[Fernando Lalo Martins]

CVSROOT:        /cvsroot/opental
Module name:    opental
Changes by:     Fernando Lalo Martins <address@hidden>  03/01/26 18:27:16

Modified files:
        OpenPTi18n     : i18n_handler.py 

Log message:
        fixing i18n_handler for the new way PlacelessTS now handles defaults.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/opental/opental/OpenPTi18n/i18n_handler.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: opental/OpenPTi18n/i18n_handler.py
diff -u opental/OpenPTi18n/i18n_handler.py:1.17 
opental/OpenPTi18n/i18n_handler.py:1.18
--- opental/OpenPTi18n/i18n_handler.py:1.17     Thu Jan 16 18:13:45 2003
+++ opental/OpenPTi18n/i18n_handler.py  Sun Jan 26 18:27:15 2003
@@ -32,11 +32,9 @@
     def __init__(self, translate):
         self.translate = translate
         
-    def __call__(self, domain, msgid, data, request, target, default=None):
+    def __call__(self, domain, msgid, data, request, target, default):
         res = self.translate(domain, msgid, data, request, target)
         if res is None or res is msgid:
-            if default is None:
-                return msgid
             return default
         return res
 
@@ -91,7 +89,6 @@
             default = ' '.join(default.split())
             if msgid == '':
                 msgid = default
-                default = None
             if info.has_key('data'):
                 data = context.engine.evaluate(info['data'])
             elif names:
@@ -107,8 +104,8 @@
         if info.has_key('attributes') and hasattr(element, 'attributes'):
             attrs = element.attributes.setdefault(element.ns, {})
             for name in info['attributes'].split():
-                attrs[name] = context.translate(domain, attrs[name], None,
-                                                request, target)
+                msgid = attrs[name]
+                attrs[name] = context.translate(domain, msgid, None, request, 
target, msgid)
         if info.has_key('name'):
             name = info['name']
             element = context.tr_engine.postprocess(element, context)