[OpenTAL-checkins] opental/PlacelessTranslationService PlacelessTr...

[Fernando Lalo Martins]

CVSROOT:        /cvsroot/opental
Module name:    opental
Changes by:     Fernando Lalo Martins <address@hidden>  03/03/05 15:30:54

Modified files:
        PlacelessTranslationService: PlacelessTranslationService.py 
                                     __init__.py 

Log message:
        reorganizing importable hooks to get permissions right

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/opental/opental/PlacelessTranslationService/PlacelessTranslationService.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/opental/opental/PlacelessTranslationService/__init__.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: opental/PlacelessTranslationService/PlacelessTranslationService.py
diff -u opental/PlacelessTranslationService/PlacelessTranslationService.py:1.15 
opental/PlacelessTranslationService/PlacelessTranslationService.py:1.16
--- opental/PlacelessTranslationService/PlacelessTranslationService.py:1.15     
Wed Mar  5 14:57:31 2003
+++ opental/PlacelessTranslationService/PlacelessTranslationService.py  Wed Mar 
 5 15:30:53 2003
@@ -17,10 +17,11 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 """Placeless Translation Service for providing I18n to file-based code.
 
-$Id: PlacelessTranslationService.py,v 1.15 2003/03/05 19:57:31 lalo Exp $
+$Id: PlacelessTranslationService.py,v 1.16 2003/03/05 20:30:53 lalo Exp $
 """
 
 import sys, re, zLOG, Globals
+from AccessControl import ClassSecurityInfo
 from OFS.Folder import Folder
 from types import DictType, StringType, UnicodeType
 from Negotiator import negotiator
@@ -68,6 +69,12 @@
     _class_version = (0, 4, 0, 4)
     all_meta_types = ()
 
+    security = ClassSecurityInfo()
+    security.declarePublic('negotiate')
+    security.declarePublic('translate')
+    security.declarePublic('getLanguages')
+    security.declarePublic('getLanguageName')
+
     def __init__(self, default_domain='global', fallbacks=None):
         self._instance_version = self._class_version
         # XXX We haven't specified that ITranslationServices have a default
@@ -135,6 +142,8 @@
         l.sort()
         return l
 
+    def negotiate(self, langs, context):
+        return negotiator.getLanguage(langs, context)
 
     def translate(self, domain, msgid, mapping=None, context=None,  
                   target_language=None, default=None):
@@ -159,7 +168,7 @@
                 for fallback in self._fallbacks:
                     if fallback not in langs:
                         langs.append(fallback)
-                target_language = negotiator.getLanguage(langs, context)
+                target_language = self.negotiate(langs, context)
 
         # Get the translation. Use the specified fallbacks if this fails
         catalog_names = self._catalogs.get((target_language, domain), ())
Index: opental/PlacelessTranslationService/__init__.py
diff -u opental/PlacelessTranslationService/__init__.py:1.8 
opental/PlacelessTranslationService/__init__.py:1.9
--- opental/PlacelessTranslationService/__init__.py:1.8 Wed Mar  5 09:08:10 2003
+++ opental/PlacelessTranslationService/__init__.py     Wed Mar  5 15:30:53 2003
@@ -16,12 +16,11 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 __version__ = '''
-$Id: __init__.py,v 1.8 2003/03/05 14:08:10 lalo Exp $
+$Id: __init__.py,v 1.9 2003/03/05 20:30:53 lalo Exp $
 '''.strip()
 
 from AccessControl import ModuleSecurityInfo, allow_module, allow_class, 
allow_type
 from PlacelessTranslationService import PlacelessTranslationService, log
-from Negotiator import negotiate
 from GettextMessageCatalog import GettextMessageCatalog
 from Products.PageTemplates.GlobalTranslationService import 
setGlobalTranslationService
 import os, fnmatch, zLOG, sys, Zope, Globals
@@ -45,6 +44,13 @@
     Globals.ImageFile('www/GettextMessageCatalog.png', globals()),
     }
 
+# import permissions
+security = ModuleSecurityInfo('Products.PlacelessTranslationService')
+security.declarePublic('negotiate')
+security.declarePublic('translate')
+security.declarePublic('getLanguages')
+security.declarePublic('getLanguageName')
+
 _marker = []
 
 def make_translation_service(cp):
@@ -78,12 +84,7 @@
     pkg.translate = translation_service.translate
     pkg.getLanguages = translation_service.getLanguages
     pkg.getLanguageName = translation_service.getLanguageName
-
-    security = ModuleSecurityInfo('Products.PlacelessTranslationService')
-    security.declarePublic('negotiate')
-    security.declarePublic('translate')
-    security.declarePublic('getLanguages')
-    security.declarePublic('getLanguageName')
+    pkg.negotiate = translation_service.negotiate
 
     # sweep the i18n directory
     basepath = os.path.join(INSTANCE_HOME, 'i18n')