summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kestenholz <mk@feinheit.ch>2019-04-17 08:41:54 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-04-24 10:54:03 +0200
commit80482e924953ec0e2484a9cb0f44bd5eeea93856 (patch)
treee67c117ea5fb9206cd0dc92c55a9a58d95ca5389
parent0c916255eb4d94e06e123fafec93efdba45b1259 (diff)
Fixes #30342 -- Removed a system check for LANGUAGES_BIDI setting.
This partly reverts commit 4400d8296d268f5a8523cd02ddc33b12219b2535.
-rw-r--r--django/core/checks/translation.py13
-rw-r--r--docs/ref/checks.txt3
-rw-r--r--docs/ref/settings.txt8
-rw-r--r--tests/check_framework/test_translation.py10
4 files changed, 8 insertions, 26 deletions
diff --git a/django/core/checks/translation.py b/django/core/checks/translation.py
index a385c2d098..ebbd1eabf3 100644
--- a/django/core/checks/translation.py
+++ b/django/core/checks/translation.py
@@ -24,12 +24,6 @@ E004 = Error(
id='translation.E004',
)
-E005 = Error(
- 'You have provided values in the LANGUAGES_BIDI setting that are not in '
- 'the LANGUAGES setting.',
- id='translation.E005',
-)
-
@register(Tags.translation)
def check_setting_language_code(app_configs, **kwargs):
@@ -62,9 +56,6 @@ def check_setting_languages_bidi(app_configs, **kwargs):
def check_language_settings_consistent(app_configs, **kwargs):
"""Error if language settings are not consistent with each other."""
available_tags = {i for i, _ in settings.LANGUAGES} | {'en-us'}
- messages = []
if settings.LANGUAGE_CODE not in available_tags:
- messages.append(E004)
- if not available_tags.issuperset(settings.LANGUAGES_BIDI):
- messages.append(E005)
- return messages
+ return [E004]
+ return []
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index 84b126bf5f..2944ad7544 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -448,9 +448,6 @@ The following checks are performed on your translation configuration:
* **translation.E004**: You have provided a value for the
:setting:`LANGUAGE_CODE` setting that is not in the :setting:`LANGUAGES`
setting.
-* **translation.E005**: You have provided values in the
- :setting:`LANGUAGES_BIDI` setting that are not in the :setting:`LANGUAGES`
- setting.
URLs
----
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index ae7436696e..b6b6f20afe 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1879,15 +1879,17 @@ Here's a sample settings file::
``LANGUAGES_BIDI``
------------------
-Default: A list of all language codes from the :setting:`LANGUAGES` setting
-that are written right-to-left. You can see the current list of these languages
-by looking in :source:`django/conf/global_settings.py`.
+Default: A list of all language codes that are written right-to-left. You can
+see the current list of these languages by looking in
+:source:`django/conf/global_settings.py`.
The list contains :term:`language codes<language code>` for languages that are
written right-to-left.
Generally, the default value should suffice. Only set this setting if you want
to restrict language selection to a subset of the Django-provided languages.
+If you define a custom :setting:`LANGUAGES` setting, the list of bidirectional
+languages may contain language codes which are not enabled on a given site.
.. setting:: LOCALE_PATHS
diff --git a/tests/check_framework/test_translation.py b/tests/check_framework/test_translation.py
index 9a34b65c06..cb6e053d77 100644
--- a/tests/check_framework/test_translation.py
+++ b/tests/check_framework/test_translation.py
@@ -80,15 +80,7 @@ class TranslationCheckTests(SimpleTestCase):
'You have provided a value for the LANGUAGE_CODE setting that is '
'not in the LANGUAGES setting.'
)
- with self.settings(LANGUAGE_CODE='fr', LANGUAGES=[('en', 'English')], LANGUAGES_BIDI=[]):
+ with self.settings(LANGUAGE_CODE='fr', LANGUAGES=[('en', 'English')]):
self.assertEqual(check_language_settings_consistent(None), [
Error(msg, id='translation.E004'),
])
- msg = (
- 'You have provided values in the LANGUAGES_BIDI setting that are '
- 'not in the LANGUAGES setting.'
- )
- with self.settings(LANGUAGE_CODE='en', LANGUAGES=[('en', 'English')], LANGUAGES_BIDI=['he']):
- self.assertEqual(check_language_settings_consistent(None), [
- Error(msg, id='translation.E005'),
- ])