From 0d610fcff485d4ef4ef01f0c68342b14fd63b153 Mon Sep 17 00:00:00 2001 From: Kouhei Sutou Date: Sun, 8 May 2011 17:32:41 +0900 Subject: [PATCH] [i18n] don't generate duplicated msgid. --- sphinx/builders/gettext.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py index 1ff92360f..732b7af62 100644 --- a/sphinx/builders/gettext.py +++ b/sphinx/builders/gettext.py @@ -67,7 +67,9 @@ class I18nBuilder(Builder): catalog = self.catalogs[docname.split(SEP, 1)[0]] for node, msg in extract_messages(doctree): - catalog.setdefault(node.uid, msg) + if not msg in catalog: + catalog[msg] = [] + catalog[msg].append(node.uid) class MessageCatalogBuilder(I18nBuilder): @@ -93,11 +95,12 @@ class MessageCatalogBuilder(I18nBuilder): pofile = open(pofn, 'w', encoding='utf-8') try: pofile.write(POHEADER % data) - for uid, message in messages.iteritems(): + for message, uids in messages.iteritems(): # message contains *one* line of text ready for translation message = message.replace(u'\\', ur'\\'). \ replace(u'"', ur'\"') - pomsg = u'#%s\nmsgid "%s"\nmsgstr ""\n\n' % (uid, message) - pofile.write(pomsg) + for uid in uids: + pofile.write(u'# %s\n' % uid) + pofile.write(u'msgid "%s"\nmsgstr ""\n\n' % message) finally: pofile.close()