Support nouvelle signature de la fonction « translate ».

[photoprint.git] / utils.py

diff --git a/utils.py b/utils.py
index 9f4fb8a..0982bc7 100755 (executable)
--- a/utils.py
+++ b/utils.py
@@ -11,27 +11,21 @@
 """
 Global utilities
 
 """
 Global utilities
 

-$Id: utils.py 651 2009-02-04 15:38:20Z pin $
-$URL: http://svn.luxia.fr/svn/labo/projects/zope/photoprint/trunk/utils.py $
+
+

 """
 
 from AccessControl import ModuleSecurityInfo
 """
 
 from AccessControl import ModuleSecurityInfo

-from Products.PageTemplates.GlobalTranslationService import getGlobalTranslationService
+from zope.i18n import translate as i18ntranslate

 from zope.i18nmessageid import MessageFactory
 from zope.i18nmessageid import MessageFactory

+from zope.globalrequest import getRequest

 
 security = ModuleSecurityInfo('Products.photoprint.utils')
 
 security.declarePublic('translate')
 
 security = ModuleSecurityInfo('Products.photoprint.utils')
 
 security.declarePublic('translate')

-def translate(message, context):
-       """ Translate i18n message.
-       """
-       GTS = getGlobalTranslationService()
-       if isinstance(message, Exception):
-               try:
-                       message = message[0]
-               except (TypeError, IndexError):
-                       pass
-       return GTS.translate('photoprint', message, context=context)
+def translate(msgid, mapping=None, default=None) :
+    """ traduction dans le domaine photoprint """
+    return i18ntranslate(msgid, domain='photoprint', mapping=mapping, context=getRequest(), default=default)

 
 security.declarePublic('Message')
 Message = _ = MessageFactory('photoprint')
 
 security.declarePublic('Message')
 Message = _ = MessageFactory('photoprint')