[Zope-Checkins] CVS: Zope3/lib/python/Zope/I18n - GlobalTranslationService.py:1.3 TranslationService.py:1.7

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/I18n
In directory cvs.zope.org:/tmp/cvs-serv29707/lib/python/Zope/I18n

Modified Files:
	GlobalTranslationService.py TranslationService.py 
Log Message:
Finished translating the TranslationService translate screen and provide a 
German translation.

The German breaks Zope, since Zope is not yet unicode safe...


=== Zope3/lib/python/Zope/I18n/GlobalTranslationService.py 1.2 => 1.3 ===
         for name in catalog_names:
             catalog = self._data[name]
-            try:
-                text = catalog.getMessage(msgid)
-                break
-            except:
-                pass
+            text = catalog.queryMessage(msgid)
 
+        # XXX That should be done by the gettext module
+        text = unicode(text, 'latin-1')
         # Now we need to do the interpolation
         return self.interpolate(text, mapping)
 


=== Zope3/lib/python/Zope/I18n/TranslationService.py 1.6 => 1.7 ===
         for name in catalog_names:
             catalog = super(TranslationService, self).__getitem__(name)
-            try:
-                text = catalog.getMessage(msgid)
-                break
-            except:
-                pass
+            text = catalog.queryMessage(msgid)
 
         # Now we need to do the interpolation
         return self.interpolate(text, mapping)