fa63893b99
Fix a major break, which causes problems with Trac. As a 0.7.1. release is not to be expected soon, this backport fixes the issue. OBS-URL: https://build.opensuse.org/request/show/286497 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Genshi?expand=0&rev=6
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
Index: /trunk/genshi/filters/tests/i18n.py
|
|
===================================================================
|
|
--- /trunk/genshi/filters/tests/i18n.py (revision 1177)
|
|
+++ /trunk/genshi/filters/tests/i18n.py (revision 1242)
|
|
@@ -928,4 +928,16 @@
|
|
"""</p></html>""",
|
|
tmpl.generate(first="FIRST", second="SECOND").render())
|
|
+
|
|
+ def test_translate_i18n_msg_ticket_404_regression(self):
|
|
+ tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
|
|
+ xmlns:i18n="http://genshi.edgewall.org/i18n">
|
|
+ <h1 i18n:msg="name">text <a>$name</a></h1>
|
|
+ </html>""")
|
|
+ gettext = lambda s: u'head [1:%(name)s] tail'
|
|
+ translator = Translator(gettext)
|
|
+ translator.setup(tmpl)
|
|
+ self.assertEqual("""<html>
|
|
+ <h1>head <a>NAME</a> tail</h1>
|
|
+ </html>""", tmpl.generate(name='NAME').render())
|
|
|
|
|
|
Index: /trunk/genshi/filters/i18n.py
|
|
===================================================================
|
|
--- /trunk/genshi/filters/i18n.py (revision 1177)
|
|
+++ /trunk/genshi/filters/i18n.py (revision 1242)
|
|
@@ -1049,5 +1049,11 @@
|
|
while parts:
|
|
order, string = parts.pop(0)
|
|
- events = self.events[order].pop(0)
|
|
+ events = self.events[order]
|
|
+ if events:
|
|
+ events = events.pop(0)
|
|
+ else:
|
|
+ # create a dummy empty text event so any remaining
|
|
+ # part of the translation can be processed.
|
|
+ events = [(TEXT, "", (None, -1, -1))]
|
|
parts_counter[order].pop()
|
|
|