mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

i18n: once again worked over the django_language parameter (cookie, get, post, session) format. It's now back to HTML format (en-us, not en_US)

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Georg Bauer 2005-10-17 19:33:30 +00:00
parent 29bd2caee6
commit 2070258460
4 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/conf/global_settings.py
View File

@ -26,11 +26,7 @@ TIME_ZONE = 'America/Chicago'
# Language code for this installation. All choices can be found here: # Language code for this installation. All choices can be found here:
# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
# http://blogs.law.harvard.edu/tech/stories/storyReader$15 # http://blogs.law.harvard.edu/tech/stories/storyReader$15
# Language codes need to be given in locale format, not in HTML language LANGUAGE_CODE = 'en-us'
# format. So it's en_US and not en-us to store here. The HTML language
# is stored in the request.LANGUAGE_CODE variable and will depend on the
# users browser.
LANGUAGE_CODE = 'en'
# Languages we provide translations for out of the base. The # Languages we provide translations for out of the base. The
# language name should be the utf-8 encoded local name for the # language name should be the utf-8 encoded local name for the

2
django/conf/project_template/settings/main.py
View File

@ -8,7 +8,7 @@ ADMINS = (
MANAGERS = ADMINS MANAGERS = ADMINS
LANGUAGE_CODE = 'en_US' LANGUAGE_CODE = 'en-us'
DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
DATABASE_NAME = '' # Or path to database file if using sqlite3. DATABASE_NAME = '' # Or path to database file if using sqlite3.

4
django/core/extensions.py
View File

@ -36,9 +36,9 @@ class DjangoContext(Context):
from django.conf import settings from django.conf import settings
self['LANGUAGES'] = settings.LANGUAGES self['LANGUAGES'] = settings.LANGUAGES
if hasattr(request, 'LANGUAGE_CODE'): if hasattr(request, 'LANGUAGE_CODE'):
self['LANGUAGE_CODE'] = request.LANGUAGE_CODE.replace('_', '-') self['LANGUAGE_CODE'] = request.LANGUAGE_CODE
else: else:
self['LANGUAGE_CODE'] = settings.LANGUAGE_CODE.replace('_', '-') self['LANGUAGE_CODE'] = settings.LANGUAGE_CODE
if DEBUG and request.META.get('REMOTE_ADDR') in INTERNAL_IPS: if DEBUG and request.META.get('REMOTE_ADDR') in INTERNAL_IPS:
self['debug'] = True self['debug'] = True
from django.core import db from django.core import db

47
django/utils/translation.py
View File

@ -32,6 +32,22 @@ _default = None
# run multiple times for one user # run multiple times for one user
_accepted = {} _accepted = {}
def to_locale(language):
"turn a language name (en-us) into a locale name (en_US)"
p = language.find('-')
if p >= 0:
return language[:p].lower()+'_'+language[p:].upper()
else:
return language.lower()
def to_language(locale):
"turns a locale name (en_US) into a language name (en-us)"
p = locale.find('_')
if p >= 0:
return locale[:p].lower()+'-'+locale[p:].lower()
else:
return locale.lower()
class DjangoTranslation(gettext_module.GNUTranslations): class DjangoTranslation(gettext_module.GNUTranslations):
""" """
This class sets up the GNUTranslations context with This class sets up the GNUTranslations context with
@ -104,6 +120,9 @@ def translation(appname, language):
from django.conf import settings from django.conf import settings
default_locale = to_locale(settings.LANGUAGE_CODE)
locale = to_locale(language)
# set up the right translation class # set up the right translation class
klass = DjangoTranslation klass = DjangoTranslation
if sys.version_info < (2, 4): if sys.version_info < (2, 4):
@ -112,7 +131,7 @@ def translation(appname, language):
globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale') globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale')
try: try:
t = gettext_module.translation('django', globalpath, [language, settings.LANGUAGE_CODE], klass) t = gettext_module.translation('django', globalpath, [locale, default_locale], klass)
t.set_app_and_language(appname, language) t.set_app_and_language(appname, language)
except IOError: t = gettext_module.NullTranslations() except IOError: t = gettext_module.NullTranslations()
_translations[(appname, language)] = t _translations[(appname, language)] = t
@ -120,7 +139,7 @@ def translation(appname, language):
if hasattr(settings, 'LOCALE_PATHS'): if hasattr(settings, 'LOCALE_PATHS'):
for localepath in settings.LOCALE_PATHS: for localepath in settings.LOCALE_PATHS:
try: try:
t = gettext_module.translation('django', localepath, [language, settings.LANGUAGE_CODE], klass) t = gettext_module.translation('django', localepath, [locale, default_locale], klass)
t.set_app_and_language(appname, language) t.set_app_and_language(appname, language)
except IOError: t = None except IOError: t = None
if t is not None: if t is not None:
@ -133,7 +152,7 @@ def translation(appname, language):
projectpath = os.path.join(os.path.dirname(project.__file__), 'locale') projectpath = os.path.join(os.path.dirname(project.__file__), 'locale')
try: try:
t = gettext_module.translation('django', projectpath, [language, settings.LANGUAGE_CODE], klass) t = gettext_module.translation('django', projectpath, [locale, default_locale], klass)
t.set_app_and_language(appname, language) t.set_app_and_language(appname, language)
except IOError: t = None except IOError: t = None
if t is not None: if t is not None:
@ -146,7 +165,7 @@ def translation(appname, language):
apppath = os.path.join(os.path.dirname(app.__file__), 'locale') apppath = os.path.join(os.path.dirname(app.__file__), 'locale')
try: try:
t = gettext_module.translation('django', apppath, [language, settings.LANGUAGE_CODE], klass) t = gettext_module.translation('django', apppath, [locale, default_locale], klass)
t.set_app_and_language(appname, language) t.set_app_and_language(appname, language)
except IOError: t = None except IOError: t = None
if t is not None: if t is not None:
@ -179,7 +198,7 @@ def get_language():
t = _active.get(currentThread(), None) t = _active.get(currentThread(), None)
if t is not None: if t is not None:
try: try:
return t.language() return to_language(t.language())
except AttributeError: except AttributeError:
pass pass
# if we don't have a real translation object, we assume # if we don't have a real translation object, we assume
@ -247,9 +266,9 @@ def get_language_from_request(request):
if request.GET or request.POST: if request.GET or request.POST:
lang_code = request.GET.get('django_language', None) or request.POST.get('django_language', None) lang_code = request.GET.get('django_language', None) or request.POST.get('django_language', None)
if lang_code is not None: if lang_code is not None:
if lang_code == 'en' or lang_code.startswith('en_'): if lang_code == 'en' or lang_code.startswith('en-'):
return lang_code return lang_code
lang = gettext_module.find('django', globalpath, [lang_code]) lang = gettext_module.find('django', globalpath, [to_locale(lang_code)])
if lang is not None: if lang is not None:
if hasattr(request, 'session'): if hasattr(request, 'session'):
request.session['django_language'] = lang_code request.session['django_language'] = lang_code
@ -260,17 +279,17 @@ def get_language_from_request(request):
if hasattr(request, 'session'): if hasattr(request, 'session'):
lang_code = request.session.get('django_language', None) lang_code = request.session.get('django_language', None)
if lang_code is not None: if lang_code is not None:
if lang_code == 'en' or lang_code.startswith('en_'): if lang_code == 'en' or lang_code.startswith('en-'):
return lang_code return lang_code
lang = gettext_module.find('django', globalpath, [lang_code]) lang = gettext_module.find('django', globalpath, [to_locale(lang_code)])
if lang is not None: if lang is not None:
return lang_code return lang_code
lang_code = request.COOKIES.get('django_language', None) lang_code = request.COOKIES.get('django_language', None)
if lang_code is not None: if lang_code is not None:
if lang_code == 'en' or lang_code.startswith('en_'): if lang_code == 'en' or lang_code.startswith('en-'):
return lang_code return lang_code
lang = gettext_module.find('django', globalpath, [lang_code]) lang = gettext_module.find('django', globalpath, [to_locale(lang_code)])
if lang is not None: if lang is not None:
return lang_code return lang_code
@ -298,7 +317,7 @@ def get_language_from_request(request):
langs.sort(lambda a,b: -1*cmp(a[1], b[1])) langs.sort(lambda a,b: -1*cmp(a[1], b[1]))
for lang, order in langs: for lang, order in langs:
if lang == 'en' or lang.startswith('en_'): if lang == 'en' or lang.startswith('en-'):
# special casing for language en and derivates, because we don't # special casing for language en and derivates, because we don't
# have an english language file available, but just fallback # have an english language file available, but just fallback
# to NullTranslation on those languages (as the source itself # to NullTranslation on those languages (as the source itself
@ -306,14 +325,14 @@ def get_language_from_request(request):
_accepted[accept] = lang _accepted[accept] = lang
return lang return lang
else: else:
langfile = gettext_module.find('django', globalpath, [lang]) langfile = gettext_module.find('django', globalpath, [to_locale(lang)])
if langfile: if langfile:
# reconstruct the actual language from the language # reconstruct the actual language from the language
# filename, because otherwise we might incorrectly # filename, because otherwise we might incorrectly
# report de_DE if we only have de available, but # report de_DE if we only have de available, but
# did find de_DE because of language normalization # did find de_DE because of language normalization
lang = langfile[len(globalpath):].split('/')[1] lang = langfile[len(globalpath):].split('/')[1]
_accepted[accept] = lang _accepted[accept] = to_language(lang)
return lang return lang
return settings.LANGUAGE_CODE return settings.LANGUAGE_CODE