innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Moved to_language() to django.utils.translation. 

Follow up to 1b7d524cfa.
This commit is contained in:
Tim Graham 2018-05-12 15:03:38 -04:00 committed by GitHub
parent 35319bf12c
commit 1e0cbc72e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/utils/translation/__init__.py
View File

@ -10,7 +10,7 @@ __all__ = [
'activate', 'deactivate', 'override', 'deactivate_all', 'activate', 'deactivate', 'override', 'deactivate_all',
'get_language', 'get_language_from_request', 'get_language', 'get_language_from_request',
'get_language_info', 'get_language_bidi', 'get_language_info', 'get_language_bidi',
'check_for_language', 'to_locale', 'templatize', 'check_for_language', 'to_language', 'to_locale', 'templatize',
'gettext', 'gettext_lazy', 'gettext_noop', 'gettext', 'gettext_lazy', 'gettext_noop',
'ugettext', 'ugettext_lazy', 'ugettext_noop', 'ugettext', 'ugettext_lazy', 'ugettext_noop',
'ngettext', 'ngettext_lazy', 'ngettext', 'ngettext_lazy',
@ -193,6 +193,15 @@ def check_for_language(lang_code):
return _trans.check_for_language(lang_code) return _trans.check_for_language(lang_code)
def to_language(locale):
"""Turn a locale name (en_US) into a language name (en-us)."""
p = locale.find('_')
if p >= 0:
return locale[:p].lower() + '-' + locale[p + 1:].lower()
else:
return locale.lower()
def to_locale(language): def to_locale(language):
"""Turn a language name (en-us) into a locale name (en_US).""" """Turn a language name (en-us) into a locale name (en_US)."""
language = language.lower() language = language.lower()

11
django/utils/translation/trans_real.py
View File

@ -16,7 +16,7 @@ from django.core.signals import setting_changed
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.safestring import SafeData, mark_safe from django.utils.safestring import SafeData, mark_safe
from . import LANGUAGE_SESSION_KEY, to_locale from . import LANGUAGE_SESSION_KEY, to_language, to_locale
# Translations are cached in a dictionary for every language. # Translations are cached in a dictionary for every language.
# The active translations are stored by threadid to make them thread local. # The active translations are stored by threadid to make them thread local.
@ -57,15 +57,6 @@ def reset_cache(**kwargs):
get_supported_language_variant.cache_clear() get_supported_language_variant.cache_clear()
def to_language(locale):
"""Turn a locale name (en_US) into a language name (en-us)."""
p = locale.find('_')
if p >= 0:
return locale[:p].lower() + '-' + locale[p + 1:].lower()
else:
return locale.lower()
class DjangoTranslation(gettext_module.GNUTranslations): class DjangoTranslation(gettext_module.GNUTranslations):
""" """
Set up the GNUTranslations context with regard to output charset. Set up the GNUTranslations context with regard to output charset.

8
tests/i18n/tests.py
View File

@ -30,8 +30,8 @@ from django.utils.translation import (
LANGUAGE_SESSION_KEY, activate, check_for_language, deactivate, LANGUAGE_SESSION_KEY, activate, check_for_language, deactivate,
get_language, get_language_bidi, get_language_from_request, get_language, get_language_bidi, get_language_from_request,
get_language_info, gettext, gettext_lazy, ngettext, ngettext_lazy, get_language_info, gettext, gettext_lazy, ngettext, ngettext_lazy,
npgettext, npgettext_lazy, pgettext, to_locale, trans_null, trans_real, npgettext, npgettext_lazy, pgettext, to_language, to_locale, trans_null,
ugettext, ugettext_lazy, ungettext, ungettext_lazy, trans_real, ugettext, ugettext_lazy, ungettext, ungettext_lazy,
) )
from .forms import CompanyForm, I18nForm, SelectDateForm from .forms import CompanyForm, I18nForm, SelectDateForm
@ -288,8 +288,8 @@ class TranslationTests(SimpleTestCase):
self.assertEqual(to_locale(lang), locale) self.assertEqual(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(to_language('en_US'), 'en-us')
self.assertEqual(trans_real.to_language('sr_Lat'), 'sr-lat') self.assertEqual(to_language('sr_Lat'), 'sr-lat')
def test_language_bidi(self): def test_language_bidi(self):
self.assertIs(get_language_bidi(), False) self.assertIs(get_language_bidi(), False)