From 5aafc17405127b728c66b2e7e516c1c9c4d660cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 4 Jun 2010 18:04:42 +0000 Subject: Issue #5464: Implement plural forms in msgfmt.py. --- Misc/NEWS | 6 ++++++ Tools/i18n/msgfmt.py | 27 +++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index ca113aa..6540d9c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -123,6 +123,12 @@ Build - Issues #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for multiprocessing only. +Tools/Demos +----------- + +- Issue #5464: Implement plural forms in msgfmt.py. + + What's New in Python 2.7 beta 2? ================================ diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py index 6433131..5dd5430 100755 --- a/Tools/i18n/msgfmt.py +++ b/Tools/i18n/msgfmt.py @@ -133,16 +133,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 >> sys.stderr, 'msgid_plural not preceeded by msgid on %s:%d' %\ + (infile, lno) + 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) + 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) + sys.exit(1) + l = l[6:] # Skip empty lines l = l.strip() if not l: -- cgit v0.12