Ticket #423: i18n.patch

Genshi-0.6/genshi/filters/i18n.py

@@ -375 +375 @@
         plural_msgbuf = None
 
         numeral = self.numeral.evaluate(ctxt)
-        is_plural = self._is_plural(numeral, ngettext)
+        is_plural = self._is_plural(numeral)
 
         for event in stream:
             if event[0] is SUB and any(isinstance(d, ChooseBranchDirective)
@@ -478 +478 @@
             (singular_msgbuf.format(), plural_msgbuf.format()), \
             comment_stack[-1:]
 
-    def _is_plural(self, numeral, ngettext):
-        # XXX: should we test which form was chosen like this!?!?!?
-        # There should be no match in any catalogue for these singular and
-        # plural test strings
-        singular = u'O\x85\xbe\xa9\xa8az\xc3?\xe6\xa1\x02n\x84\x93'
-        plural = u'\xcc\xfb+\xd3Pn\x9d\tT\xec\x1d\xda\x1a\x88\x00'
-        return ngettext(singular, plural, numeral) == plural
-
+    def _is_plural(self, numeral):
+        return numeral != 1
 
 class DomainDirective(I18NDirective):
     """Implementation of the ``i18n:domain`` directive which allows choosing