From 67a62703cc8ade30df875ec272113cc157c067f0 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 18 Dec 2015 17:00:53 +0100 Subject: [1.8.x] Fixed #25915 -- Allowed language not in Django's default LANGUAGES This fixes a regression introduced by a5f6cbce07. Thanks Gavin Wahl for the report and Tim Graham for the review. Backport of cd3c042b0 from master. --- .../i18n/commands/locale/xxx/LC_MESSAGES/django.mo | Bin 0 -> 457 bytes .../i18n/commands/locale/xxx/LC_MESSAGES/django.po | 21 +++++++++++++++++++++ tests/i18n/tests.py | 19 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 tests/i18n/commands/locale/xxx/LC_MESSAGES/django.mo create mode 100644 tests/i18n/commands/locale/xxx/LC_MESSAGES/django.po (limited to 'tests') diff --git a/tests/i18n/commands/locale/xxx/LC_MESSAGES/django.mo b/tests/i18n/commands/locale/xxx/LC_MESSAGES/django.mo new file mode 100644 index 0000000000..1d9eeba048 Binary files /dev/null and b/tests/i18n/commands/locale/xxx/LC_MESSAGES/django.mo differ diff --git a/tests/i18n/commands/locale/xxx/LC_MESSAGES/django.po b/tests/i18n/commands/locale/xxx/LC_MESSAGES/django.po new file mode 100644 index 0000000000..8fe7b7fa3d --- /dev/null +++ b/tests/i18n/commands/locale/xxx/LC_MESSAGES/django.po @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-04 04:59-0600\n" +"PO-Revision-Date: 2011-12-10 19:12-0300\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: xxx\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +msgid "year" +msgstr "reay" diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index 29bb2e9cb6..8b9f83bf4a 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -1527,3 +1527,22 @@ class TranslationFilesMissing(TestCase): self.patchGettextFind() trans_real._translations = {} self.assertRaises(IOError, activate, 'en') + + +class NonDjangoLanguageTests(SimpleTestCase): + """ + A language non present in default Django languages can still be + installed/used by a Django project. + """ + @override_settings( + USE_I18N=True, + LANGUAGES=[ + ('en-us', 'English'), + ('xxx', 'Somelanguage'), + ], + LANGUAGE_CODE='xxx', + LOCALE_PATHS=[os.path.join(here, 'commands', 'locale')], + ) + def test_non_django_language(self): + self.assertEqual(get_language(), 'xxx') + self.assertEqual(ugettext("year"), "reay") -- cgit v1.3