Merge pull request #564 from cedk/skip-empty-msgid

Skip empty message when writing mo file

Author: akx

babel/messages/mofile.py

@@ -153,8 +153,8 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
  in the output
  """
  messages = list(catalog)
- if not use_fuzzy:
- messages[1:] = [m for m in messages[1:] if not m.fuzzy]
+ messages[1:] = [m for m in messages[1:]
+  if m.string and (use_fuzzy or not m.fuzzy)]
  messages.sort()
 
  ids = strs = b''
@@ -178,10 +178,7 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
  ])
  else:
  msgid = message.id.encode(catalog.charset)
- if not message.string:
- msgstr = message.id.encode(catalog.charset)
- else:
- msgstr = message.string.encode(catalog.charset)
+ msgstr = message.string.encode(catalog.charset)
  if message.context:
  msgid = b'\x04'.join([message.context.encode(catalog.charset),
  msgid])

tests/messages/test_mofile.py

@@ -71,3 +71,26 @@ def test_more_plural_forms(self):
  catalog2.add(('Fuzz', 'Fuzzes'), ('', '', ''))
  buf = BytesIO()
  mofile.write_mo(buf, catalog2)
+
+ def test_empty_translation_with_fallback(self):
+ catalog1 = Catalog(locale='fr_FR')
+ catalog1.add(u'', '''\
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n''')
+ catalog1.add(u'Fuzz', '')
+ buf1 = BytesIO()
+ mofile.write_mo(buf1, catalog1)
+ buf1.seek(0)
+ catalog2 = Catalog(locale='fr')
+ catalog2.add(u'', '''\
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n''')
+ catalog2.add(u'Fuzz', 'Flou')
+ buf2 = BytesIO()
+ mofile.write_mo(buf2, catalog2)
+ buf2.seek(0)
+
+ translations = Translations(fp=buf1)
+ translations.add_fallback(Translations(fp=buf2))
+
+ self.assertEqual(u'Flou', translations.ugettext('Fuzz'))