Merged revisions 81697 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81697 | martin.v.loewis | 2010-06-04 20:04:42 +0200 (Fr, 04 Jun 2010) | 2 lines

  Issue #5464: Implement plural forms in msgfmt.py.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 1bd8a5f138519d5b22f0e9d93d5013d00a218745..51d1c3fb750d36947fba0b49d24bbff446e7473b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1548,6 +1548,8 @@ Tests
 Tools/Demos
 -----------
 
+- Issue #5464: Implement plural forms in msgfmt.py.
+
 - iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were
   added to the `Tools/` directory.  They were previously living in the
   sandbox.

diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
index f481c882bc42feb6770fd3926bfd40b24f7a18ed..6239f8bba4cd394be00b2e545412587d53bd4efc 100755 (executable)
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -132,16 +132,39 @@ def make(filename, outfile):
         if l[0] == '#':
             continue
         # Now we are in a msgid section, output previous section
-        if l.startswith('msgid'):
+        if l.startswith('msgid') and not l.startswith('msgid_plural'):
             if section == STR:
                 add(msgid, msgstr, fuzzy)
             section = ID
             l = l[5:]
             msgid = msgstr = ''
+            is_plural = False
+        # This is a message with plural forms
+        elif l.startswith('msgid_plural'):
+            if section != ID:
+                print('msgid_plural not preceeded by msgid on %s:%d' % (infile, lno),
+                      file=sys.stderr)
+                sys.exit(1)
+            l = l[12:]
+            msgid += '\0' # separator of singular and plural
+            is_plural = True
         # Now we are in a msgstr section
         elif l.startswith('msgstr'):
             section = STR
-            l = l[6:]
+            if l.startswith('msgstr['):
+                if not is_plural:
+                    print(sys.stderr, 'plural without msgid_plural on %s:%d' % (infile, lno),
+                          file=sys.stderr)
+                    sys.exit(1)
+                l = l.split(']', 1)[1]
+                if msgstr:
+                    msgstr += '\0' # Separator of the various plural forms
+            else:
+                if is_plural:
+                    print(sys.stderr, 'indexed msgstr required for plural on  %s:%d' % (infile, lno),
+                          file=sys.stderr)
+                    sys.exit(1)
+                l = l[6:]
         # Skip empty lines
         l = l.strip()
         if not l: