Changeset 1105 for trunk

Timestamp:

Apr 16, 2010, 2:48:05 PM (13 years ago)

Author:

cmlenz

Message:

Fix regression in [1099]: templates must not have an implicit loader during message extraction.

File:

• trunk/genshi/filters/i18n.py (modified) (3 diffs)

trunk/genshi/filters/i18n.py

@@ -404 +404 @@
         # There should be no match in any catalogue for these singular and
         # plural test strings
-        singular_test = ur'O\x85\xbe\xa9\xa8az\xc3?\xe6\xa1\x02n\x84\x93'
-        plural_test = ur'\xcc\xfb+\xd3Pn\x9d\tT\xec\x1d\xda\x1a\x88\x00'
+        singular_test = u'O\x85\xbe\xa9\xa8az\xc3?\xe6\xa1\x02n\x84\x93'
+        plural_test = u'\xcc\xfb+\xd3Pn\x9d\tT\xec\x1d\xda\x1a\x88\x00'
         translation = ngettext(singular_test, plural_test,
                                self.numeral.evaluate(ctxt))
@@ -924 +924 @@
         """Initialize the message buffer.
         
-        :param params: comma-separated list of parameter names
-        :type params: `basestring`
-        :param lineno: the line number on which the first stream event
-                       belonging to the message was found
+        :param directive: the directive owning the buffer
+        :type directive: I18NDirective
         """
         # params list needs to be copied so that directives can be evaluated
@@ -1225 +1223 @@
     tmpl = template_class(fileobj, filename=getattr(fileobj, 'name', None),
                           encoding=encoding)
+    tmpl.loader = None
 
     translator = Translator(None, ignore_tags, include_attrs, extract_text)