Allow both dash and underscore separated locale identifiers in pofiles

Fixes #489

Augments #420 (08b9c5e76e19ae)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 3145fa37a2c97a831174e5c6cda43daf0831bab7..fd40058ad486bbbd7e576c61afd62a0fa0e22991 100644 (file)
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -395,6 +395,7 @@ class Catalog(object):
             elif name == 'last-translator':
                 self.last_translator = value
             elif name == 'language':
+                value = value.replace('-', '_')
                 self.locale = Locale.parse(value)
             elif name == 'language-team':
                 self.language_team = value

diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index ebf9702d81fc14085d9e3c3de5b91ebe568c8662..f6cd66dba29ee3428444deadd024a84fca6c054a 100644 (file)
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -36,6 +36,12 @@ msgstr ""
 "Language: en_US\n"''')
         catalog = pofile.read_po(buf, locale='de')
         self.assertEqual(Locale('en', 'US'), catalog.locale)
+        buf = StringIO(r'''
+msgid ""
+msgstr ""
+"Language: ko-KR\n"''')
+        catalog = pofile.read_po(buf, locale='de')
+        self.assertEqual(Locale('ko', 'KR'), catalog.locale)
 
     def test_preserve_domain(self):
         buf = StringIO(r'''msgid "foo"