From 4a6e86f163b26e39083ff9997096ab350c68de3c Mon Sep 17 00:00:00 2001 From: farhan5900 Date: Mon, 28 Mar 2022 11:02:39 +0530 Subject: Plural-Forms: Fix missing trailing semicolon Adds missing semicolon in the code that generates the header that is Catalog.plural_forms as well as in plural.to_gettext function. Also modifies all the concerning test cases as well as test data files. Closes https://github.com/python-babel/babel/issues/836 --- .../data/project/i18n/de/LC_MESSAGES/messages.po | 2 +- .../data/project/i18n/de_DE/LC_MESSAGES/bar.po | 2 +- .../data/project/i18n/de_DE/LC_MESSAGES/foo.po | 2 +- .../data/project/i18n/de_DE/LC_MESSAGES/messages.po | 2 +- .../data/project/i18n/ru_RU/LC_MESSAGES/messages.po | 2 +- tests/messages/test_catalog.py | 6 +++--- tests/messages/test_checkers.py | 12 ++++++------ tests/messages/test_frontend.py | 18 +++++++++--------- tests/messages/test_pofile.py | 8 ++++---- tests/test_plural.py | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) (limited to 'tests') diff --git a/tests/messages/data/project/i18n/de/LC_MESSAGES/messages.po b/tests/messages/data/project/i18n/de/LC_MESSAGES/messages.po index c5c9748..8fbefdb 100644 --- a/tests/messages/data/project/i18n/de/LC_MESSAGES/messages.po +++ b/tests/messages/data/project/i18n/de/LC_MESSAGES/messages.po @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2007-07-30 22:18+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: de_DE \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po index c5c9748..8fbefdb 100644 --- a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po +++ b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2007-07-30 22:18+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: de_DE \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po index c5c9748..8fbefdb 100644 --- a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po +++ b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2007-07-30 22:18+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: de_DE \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/messages.po b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/messages.po index aa49563..2cd2618 100644 --- a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/messages.po +++ b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/messages.po @@ -13,7 +13,7 @@ msgstr "" "PO-Revision-Date: 2007-07-30 22:18+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: de_DE \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/messages/data/project/i18n/ru_RU/LC_MESSAGES/messages.po b/tests/messages/data/project/i18n/ru_RU/LC_MESSAGES/messages.po index 05a9d3d..7403a95 100644 --- a/tests/messages/data/project/i18n/ru_RU/LC_MESSAGES/messages.po +++ b/tests/messages/data/project/i18n/ru_RU/LC_MESSAGES/messages.po @@ -14,7 +14,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language-Team: ru_RU \n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py index 2d36809..830cabf 100644 --- a/tests/messages/test_catalog.py +++ b/tests/messages/test_catalog.py @@ -386,7 +386,7 @@ def test_catalog_mime_headers_set_locale(): ('Last-Translator', 'John Doe '), ('Language', 'de_DE'), ('Language-Team', 'de_DE '), - ('Plural-Forms', 'nplurals=2; plural=(n != 1)'), + ('Plural-Forms', 'nplurals=2; plural=(n != 1);'), ('MIME-Version', '1.0'), ('Content-Type', 'text/plain; charset=utf-8'), ('Content-Transfer-Encoding', '8bit'), @@ -407,9 +407,9 @@ def test_catalog_plural_expr(): def test_catalog_plural_forms(): assert (catalog.Catalog(locale='en').plural_forms - == 'nplurals=2; plural=(n != 1)') + == 'nplurals=2; plural=(n != 1);') assert (catalog.Catalog(locale='pt_BR').plural_forms - == 'nplurals=2; plural=(n > 1)') + == 'nplurals=2; plural=(n > 1);') def test_catalog_setitem(): diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py index 07286b1..b709d4b 100644 --- a/tests/messages/test_checkers.py +++ b/tests/messages/test_checkers.py @@ -50,7 +50,7 @@ msgstr "" "PO-Revision-Date: %(date)s\\n" "Last-Translator: FULL NAME \\n" "Language-Team: %(locale)s \n" -"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s\\n" +"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s;\\n" "MIME-Version: 1.0\\n" "Content-Type: text/plain; charset=utf-8\\n" "Content-Transfer-Encoding: 8bit\\n" @@ -117,7 +117,7 @@ msgstr "" "PO-Revision-Date: %(date)s\\n" "Last-Translator: FULL NAME \\n" "Language-Team: %(locale)s \\n" -"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s\\n" +"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s;\\n" "MIME-Version: 1.0\\n" "Content-Type: text/plain; charset=utf-8\\n" "Content-Transfer-Encoding: 8bit\\n" @@ -168,7 +168,7 @@ msgstr "" "PO-Revision-Date: %(date)s\n" "Last-Translator: FULL NAME \n" "Language-Team: %(locale)s \n" -"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s\n" +"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -219,7 +219,7 @@ msgstr "" "PO-Revision-Date: %(date)s\n" "Last-Translator: FULL NAME \n" "Language-Team: %(locale)s \n" -"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s\n" +"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -271,7 +271,7 @@ msgstr "" "PO-Revision-Date: %(date)s\n" "Last-Translator: FULL NAME \n" "Language-Team: %(locale)s \n" -"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s\n" +"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -324,7 +324,7 @@ msgstr "" "PO-Revision-Date: %(date)s\n" "Last-Translator: FULL NAME \n" "Language-Team: %(locale)s \n" -"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s\n" +"Plural-Forms: nplurals=%(num_plurals)s; plural=%(plural_expr)s;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py index ba78f50..f8a58dd 100644 --- a/tests/messages/test_frontend.py +++ b/tests/messages/test_frontend.py @@ -404,7 +404,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language: en_US\n" "Language-Team: en_US \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -456,7 +456,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language: en_US\n" "Language-Team: en_US \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -509,7 +509,7 @@ msgstr "" "Language: lv_LV\n" "Language-Team: lv_LV \n" "Plural-Forms: nplurals=3; plural=(n%%10==1 && n%%100!=11 ? 0 : n != 0 ? 1 :" -" 2)\n" +" 2);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -562,7 +562,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language: ja_JP\n" "Language-Team: ja_JP \n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -621,7 +621,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language: en_US\n" "Language-Team: en_US \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -681,7 +681,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language: en_US\n" "Language-Team: en_US \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -985,7 +985,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language: en_US\n" "Language-Team: en_US \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1033,7 +1033,7 @@ msgstr "" "Last-Translator: FULL NAME \n" "Language: ja_JP\n" "Language-Team: ja_JP \n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1081,7 +1081,7 @@ msgstr "" "Language: lv_LV\n" "Language-Team: lv_LV \n" "Plural-Forms: nplurals=3; plural=(n%%10==1 && n%%100!=11 ? 0 : n != 0 ? 1 :" -" 2)\n" +" 2);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py index ff0295a..b154c09 100644 --- a/tests/messages/test_pofile.py +++ b/tests/messages/test_pofile.py @@ -58,7 +58,7 @@ msgstr "" "PO-Revision-Date: 2007-09-27 21:42-0700\\n" "Last-Translator: John \\n" "Language-Team: German Lang \\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\\n" "MIME-Version: 1.0\\n" "Content-Type: text/plain; charset=iso-8859-1\\n" "Content-Transfer-Encoding: 8bit\\n" @@ -127,7 +127,7 @@ msgstr "" "Last-Translator: John \n" "Language: de\n" "Language-Team: German Lang \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -392,7 +392,7 @@ msgstr[1] "Vohs [text]"''') buf = StringIO('''\ msgid "" msgstr "" -"Plural-Forms: nplurals=3; plural=(n < 2) ? n : 2\n" +"Plural-Forms: nplurals=3; plural=(n < 2) ? n : 2;\n" msgid "foo" msgid_plural "foos" @@ -412,7 +412,7 @@ msgstr[1] "Vohs [text]" buf = StringIO('''\ msgid "" msgstr "" -"Plural-Forms: nplurals=3; plural=(n < 2) ? n : 2\n" +"Plural-Forms: nplurals=3; plural=(n < 2) ? n : 2;\n" msgid "foo" msgid_plural "foos" diff --git a/tests/test_plural.py b/tests/test_plural.py index 5dbe311..dd28dc1 100644 --- a/tests/test_plural.py +++ b/tests/test_plural.py @@ -84,7 +84,7 @@ def test_to_python(): def test_to_gettext(): assert (plural.to_gettext({'one': 'n is 1', 'two': 'n is 2'}) - == 'nplurals=3; plural=((n == 1) ? 0 : (n == 2) ? 1 : 2)') + == 'nplurals=3; plural=((n == 1) ? 0 : (n == 2) ? 1 : 2);') def test_in_range_list(): @@ -120,7 +120,7 @@ def test_plural_within_rules(): " ? 'few' : (n == 1) ? 'one' : 'other'; })") assert plural.to_gettext(p) == ( 'nplurals=3; plural=(((n == 2) || (n == 4) || (n >= 7 && n <= 9))' - ' ? 1 : (n == 1) ? 0 : 2)') + ' ? 1 : (n == 1) ? 0 : 2);') assert p(0) == 'other' assert p(1) == 'one' assert p(2) == 'few' -- cgit v1.2.1