[Checkins] SVN: Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/template.py Removed dubious language negotiation support.

Malthe Borch mborch at gmail.com
Tue Nov 18 05:32:24 EST 2008


Log message for revision 93073:
  Removed dubious language negotiation support.

Changed:
  U   Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/template.py

-=-
Modified: Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/template.py
===================================================================
--- Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/template.py	2008-11-18 09:08:31 UTC (rev 93072)
+++ Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/template.py	2008-11-18 10:32:23 UTC (rev 93073)
@@ -1,25 +1,7 @@
-from zope import i18n
-
 from chameleon.core import template
-from chameleon.core import config
 
 import language
 
-def prepare_language_support(**kwargs):
-    target_language = kwargs.get('target_language')
-
-    if config.DISABLE_I18N:
-        if target_language:
-            del kwargs['target_language']
-        return
-    
-    if not target_language:
-        context = kwargs.get(config.SYMBOLS.i18n_context)
-        target_language = i18n.negotiate(context)
-
-        if target_language:
-            kwargs['target_language'] = target_language    
-
 class PageTemplate(template.Template):
     __doc__ = template.Template.__doc__ # for Sphinx autodoc
 
@@ -30,10 +12,6 @@
             parser = self.default_parser
         super(PageTemplate, self).__init__(body, parser, format, doctype)
 
-    def render(self, **kwargs):
-        prepare_language_support(**kwargs)
-        return super(PageTemplate, self).render(**kwargs)
-
 class PageTemplateFile(template.TemplateFile):
     __doc__ = template.TemplateFile.__doc__ # for Sphinx autodoc
 
@@ -45,7 +23,3 @@
             parser = self.default_parser
         super(PageTemplateFile, self).__init__(filename, parser, format,
                                                doctype, **kwargs)
-
-    def render(self, **kwargs):
-        prepare_language_support(**kwargs)
-        return super(PageTemplateFile, self).render(**kwargs)



More information about the Checkins mailing list