p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Aliased trans_null.to_locale() to trans_real.to_locale(). 

The implementations have unintentionally diverged.
This commit is contained in:
Hasan Ramezani 2018-05-11 15:59:31 +04:30 committed by Tim Graham
parent a5a2ceeb45
commit ac59ec8f1a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/utils/translation/trans_null.py
View File

@ -4,6 +4,8 @@
from django.conf import settings from django.conf import settings
from .trans_real import to_locale as trans_real_to_locale
def gettext(message): def gettext(message):
return message return message
@ -52,12 +54,7 @@ def check_for_language(x):
return True return True
def to_locale(language): to_locale = trans_real_to_locale
p = language.find('-')
if p >= 0:
return language[:p].lower() + '_' + language[p + 1:].upper()
else:
return language.lower()
def get_language_from_request(request, check_path=False): def get_language_from_request(request, check_path=False):

1
tests/i18n/tests.py
View File

@ -286,6 +286,7 @@ class TranslationTests(SimpleTestCase):
for lang, locale in tests: for lang, locale in tests:
with self.subTest(lang=lang): with self.subTest(lang=lang):
self.assertEqual(to_locale(lang), locale) self.assertEqual(to_locale(lang), locale)
self.assertEqual(trans_null.to_locale(lang), locale)
def test_to_language(self): def test_to_language(self):
self.assertEqual(trans_real.to_language('en_US'), 'en-us') self.assertEqual(trans_real.to_language('en_US'), 'en-us')