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

Removed unused import, corrected a typo, and made some styling fixes. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Gary Wilson Jr 2008-03-08 03:55:47 +00:00
parent 5b762ca8e7
commit dcdd9b3c63
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
"Translation helper functions" """Translation helper functions."""
import locale import locale
import os import os
@ -7,7 +7,6 @@ import sys
import gettext as gettext_module import gettext as gettext_module
from cStringIO import StringIO from cStringIO import StringIO
from django.utils.encoding import force_unicode
from django.utils.safestring import mark_safe, SafeData from django.utils.safestring import mark_safe, SafeData
try: try:
@ -30,7 +29,7 @@ _active = {}
# The default translation is based on the settings file. # The default translation is based on the settings file.
_default = None _default = None
# This is a cache for normalised accept-header languages to prevent multiple # This is a cache for normalized accept-header languages to prevent multiple
# file lookups when checking the same locale on repeated requests. # file lookups when checking the same locale on repeated requests.
_accepted = {} _accepted = {}
@ -56,7 +55,7 @@ def to_locale(language, to_lower=False):
return language.lower() return language.lower()
def to_language(locale): def to_language(locale):
"Turns a locale name (en_US) into a language name (en-us)." """Turns a locale name (en_US) into a language name (en-us)."""
p = locale.find('_') p = locale.find('_')
if p >= 0: if p >= 0:
return locale[:p].lower()+'-'+locale[p+1:].lower() return locale[:p].lower()+'-'+locale[p+1:].lower()
@ -229,7 +228,7 @@ def deactivate_all():
_active[currentThread()] = gettext_module.NullTranslations() _active[currentThread()] = gettext_module.NullTranslations()
def get_language(): def get_language():
"Returns the currently selected language." """Returns the currently selected language."""
t = _active.get(currentThread(), None) t = _active.get(currentThread(), None)
if t is not None: if t is not None:
try: try:
@ -251,7 +250,7 @@ def get_language_bidi():
def catalog(): def catalog():
""" """
This function returns the current active catalog for further processing. Returns the current active catalog for further processing.
This can be used if you need to modify the catalog or want to access the This can be used if you need to modify the catalog or want to access the
whole message catalog instead of just translating one string. whole message catalog instead of just translating one string.
""" """
@ -374,7 +373,7 @@ def get_language_from_request(request):
normalized = locale.locale_alias.get(to_locale(accept_lang, True)) normalized = locale.locale_alias.get(to_locale(accept_lang, True))
if not normalized: if not normalized:
continue continue
# Remove the default encoding from locale_alias # Remove the default encoding from locale_alias.
normalized = normalized.split('.')[0] normalized = normalized.split('.')[0]
if normalized in _accepted: if normalized in _accepted:
@ -396,9 +395,9 @@ def get_language_from_request(request):
def get_date_formats(): def get_date_formats():
""" """
This function checks whether translation files provide a translation for some Checks whether translation files provide a translation for some technical
technical message ID to store date and time formats. If it doesn't contain message ID to store date and time formats. If it doesn't contain one, the
one, the formats provided in the settings will be used. formats provided in the settings will be used.
""" """
from django.conf import settings from django.conf import settings
date_format = ugettext('DATE_FORMAT') date_format = ugettext('DATE_FORMAT')
@ -414,9 +413,9 @@ def get_date_formats():
def get_partial_date_formats(): def get_partial_date_formats():
""" """
This function checks whether translation files provide a translation for some Checks whether translation files provide a translation for some technical
technical message ID to store partial date formats. If it doesn't contain message ID to store partial date formats. If it doesn't contain one, the
one, the formats provided in the settings will be used. formats provided in the settings will be used.
""" """
from django.conf import settings from django.conf import settings
year_month_format = ugettext('YEAR_MONTH_FORMAT') year_month_format = ugettext('YEAR_MONTH_FORMAT')
@ -440,6 +439,7 @@ block_re = re.compile(r"""^\s*blocktrans(?:\s+|$)""")
endblock_re = re.compile(r"""^\s*endblocktrans$""") endblock_re = re.compile(r"""^\s*endblocktrans$""")
plural_re = re.compile(r"""^\s*plural$""") plural_re = re.compile(r"""^\s*plural$""")
constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""") constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")
def templatize(src): def templatize(src):
""" """
Turns a Django template into something that is understood by xgettext. It Turns a Django template into something that is understood by xgettext. It
@ -475,7 +475,7 @@ def templatize(src):
elif pluralmatch: elif pluralmatch:
inplural = True inplural = True
else: else:
raise SyntaxError, "Translation blocks must not include other block tags: %s" % t.contents raise SyntaxError("Translation blocks must not include other block tags: %s" % t.contents)
elif t.token_type == TOKEN_VAR: elif t.token_type == TOKEN_VAR:
if inplural: if inplural:
plural.append('%%(%s)s' % t.contents) plural.append('%%(%s)s' % t.contents)
@ -541,4 +541,3 @@ def parse_accept_lang_header(lang_string):
result.append((lang, priority)) result.append((lang, priority))
result.sort(lambda x, y: -cmp(x[1], y[1])) result.sort(lambda x, y: -cmp(x[1], y[1]))
return result return result