mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #29144 -- Made untranslated strings for territorial language variants use translations from the generic language variant.

Browse Source
This commit is contained in:
Patryk Zawadzki
2018-02-19 19:09:33 +01:00
committed by Tim Graham
parent 939e0a5995
commit a20aae414e
9 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
tests/i18n/territorial_fallback/__init__.py Normal file
View File

BIN
tests/i18n/territorial_fallback/locale/de/LC_MESSAGES/django.mo Normal file
View File

Binary file not shown.

27
tests/i18n/territorial_fallback/locale/de/LC_MESSAGES/django.po Normal file
View File

@@ -0,0 +1,27 @@
# 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 <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-04-25 15:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: DE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Translators: This comment should be extracted
#: __init__.py:1
msgid "Test 1 (en)"
msgstr "Test 1 (de)"
#: __init__.py:2
msgid "Test 2 (en)"
msgstr "Test 2 (de)"

BIN
tests/i18n/territorial_fallback/locale/de_DE/LC_MESSAGES/django.mo Normal file
View File

Binary file not shown.

27
tests/i18n/territorial_fallback/locale/de_DE/LC_MESSAGES/django.po Normal file
View File

@@ -0,0 +1,27 @@
# 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 <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-04-25 15:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: DE-DE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Translators: This comment should be extracted
#: __init__.py:1
msgid "Test 1 (en)"
msgstr "Test 1 (de-de)"
#: __init__.py:2
msgid "Test 2 (en)"
msgstr ""

14
tests/i18n/tests.py
View File

@@ -1455,6 +1455,20 @@ class DjangoFallbackResolutionOrderI18NTests(ResolutionOrderI18NTests):
self.assertEqual(gettext('Date/time'), 'Datum/Zeit')
@override_settings(INSTALLED_APPS=['i18n.territorial_fallback'])
class TranslationFallbackI18NTests(ResolutionOrderI18NTests):
def test_sparse_territory_catalog(self):
"""
Untranslated strings for territorial language variants use the
translations of the generic language. In this case, the de-de
translation falls back to de.
"""
with translation.override('de-de'):
self.assertGettext('Test 1 (en)', '(de-de)')
self.assertGettext('Test 2 (en)', '(de)')
class TestModels(TestCase):
def test_lazy(self):
tm = TestModel()