Context Navigation

Changeset 1057

Timestamp:

May 12, 2009, 9:37:25 AM (14 years ago)

Author:

palgarvio

Message:

Complete fix for ticket #300.

Location:

branches/experimental/advanced-i18n/genshi/filters

Files:

-                      r1056
+                      r1057
         strip_directive = [d for d in directives if
                            isinstance(d, StripDirective)]
-        new_stream.append(stream.next())
         previous = stream.next()
+        if previous[0] is START:
+            new_stream.append(previous)
+        else:
+            msgbuf.append(*previous)
+        previous = stream.next()
         for kind, data, pos in stream:
             if kind is SUB and not strip_directive:
 …
             msgbuf.append(*previous)
             previous = kind, data, pos
+        if previous[0] is not END:
+            msgbuf.append(*previous)
+            previous = None
         for event in msgbuf.translate(gettext(msgbuf.format())):
             new_stream.append(event)
+        new_stream.append(previous)
+        if previous:
+            new_stream.append(previous)
         if strip_directive:
             return _apply_directives(new_stream, strip_directive, ctxt)

-                      r1056
+                      r1057
             xmlns:i18n="http://genshi.edgewall.org/i18n">
           <i18n:msg params="date, author">
             Changed ${ 'one day' } ago by ${ 'me, the author' }
+            Changed ${ date } ago by ${ author }
           </i18n:msg>
         </html>""")
+        translator = Translator()
+        translator.setup(tmpl)
+        self.assertEqual("""<html>
+            Changed one day ago by me, the author
+        </html>""", tmpl.generate().render())
+        translations = DummyTranslations({
+            u'Changed %(date)s ago by %(author)s': u'Modificado à %(date)s por %(author)s'
+        })
+        translator = Translator(translations)
+        translator.setup(tmpl)
+        self.assertEqual("""<html>
+          Modificado à um dia por Pedro
+        </html>""", tmpl.generate(date='um dia', author="Pedro").render())

Note: See TracChangeset for help on using the changeset viewer.