diff options
| author | Aarni Koskela <akx@iki.fi> | 2016-07-08 20:59:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 20:59:04 +0300 |
| commit | 95a8632503c7c41daaf89227be7daf393d0aabc3 (patch) | |
| tree | 2d930e00e986e33bf402ddaa111ca7309ba6bad4 | |
| parent | 432160532935d5546804921bef01efde94d9c2f0 (diff) | |
| parent | 08b9c5e76e19ae610f28759a5cf37621ac2fb734 (diff) | |
| download | babel-95a8632503c7c41daaf89227be7daf393d0aabc3.tar.gz | |
Merge pull request #420 from kruton/read-locale
Read locale from .po if it has Language header
| -rw-r--r-- | babel/messages/catalog.py | 2 | ||||
| -rw-r--r-- | tests/messages/test_pofile.py | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py index aeb9a9e..84cee43 100644 --- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -402,6 +402,8 @@ class Catalog(object): self.msgid_bugs_address = value elif name == 'last-translator': self.last_translator = value + elif name == 'language': + self.locale = Locale.parse(value) elif name == 'language-team': self.language_team = value elif name == 'content-type': diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py index a271a84..4c525b5 100644 --- a/tests/messages/test_pofile.py +++ b/tests/messages/test_pofile.py @@ -29,6 +29,14 @@ msgstr "Voh"''') catalog = pofile.read_po(buf, locale='en_US') self.assertEqual(Locale('en', 'US'), catalog.locale) + def test_locale_gets_overridden_by_file(self): + buf = StringIO(r''' +msgid "" +msgstr "" +"Language: en_US\n"''') + catalog = pofile.read_po(buf, locale='de') + self.assertEqual(Locale('en', 'US'), catalog.locale) + def test_preserve_domain(self): buf = StringIO(r'''msgid "foo" msgstr "Voh"''') @@ -112,6 +120,7 @@ msgstr "" "POT-Creation-Date: 2007-09-27 11:19+0700\n" "PO-Revision-Date: 2007-09-27 21:42-0700\n" "Last-Translator: John <cleese@bavaria.de>\n" +"Language: de\n" "Language-Team: German Lang <de@babel.org>\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" @@ -128,6 +137,7 @@ msgstr "" tzinfo=FixedOffsetTimezone(7 * 60)), catalog.creation_date) self.assertEqual(u'John <cleese@bavaria.de>', catalog.last_translator) + self.assertEqual(Locale('de'), catalog.locale) self.assertEqual(u'German Lang <de@babel.org>', catalog.language_team) self.assertEqual(u'iso-8859-2', catalog.charset) self.assertEqual(True, list(catalog)[0].fuzzy) |