From: Benoît Pin <benoit.pin@gmail.com>
Date: Tue, 26 Oct 2010 14:18:27 +0000 (+0200)
Subject: Résolu : problème de localisation avec zope-2.12.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/commitdiff_plain/d7c8ba5c710b0b34ef8b1b718e5aefa327c06863?ds=sidebyside;hp=af9b4da41b83e5813616436bc4f59eb0128893a8

Résolu : problème de localisation avec zope-2.12.
---

diff --git a/utils.py b/utils.py
index 726c4e8..14097e4 100755
--- a/utils.py
+++ b/utils.py
@@ -36,7 +36,7 @@ from Products.CMFCore.utils import getToolByName, getUtilityByInterfaceName
 from Products.CMFCore.exceptions import BadRequest
 from Products.Utf8Splitter.Utf8Splitter import Utf8Utils
 from Globals import REPLACEABLE, NOT_REPLACEABLE, UNIQUE
-#from Products.PageTemplates.GlobalTranslationService import getGlobalTranslationService
+from zope.i18n import translate as i18ntranslate
 from zope.i18n.interfaces import IUserPreferredLanguages
 from zope.i18nmessageid import MessageFactory
 from zope.component.interfaces import ComponentLookupError
@@ -195,15 +195,12 @@ security.declarePublic('translate')
 def translate(message, context):
 	""" Translate i18n message.
 	"""
-	# TODO : localisation.
-	#GTS = getGlobalTranslationService()
 	if isinstance(message, Exception):
 		try:
 			message = message[0]
 		except (TypeError, IndexError):
 			pass
-	return message
-	return GTS.translate('plinn', message, context=context)
+	return i18ntranslate(message, domain='plinn', context=context.REQUEST)
 
 security.declarePublic('desacc')
 desacc = Utf8Utils.desacc