Browse Source

Improved utils.translation API.

backports/m1-live
Erik Stein 8 years ago
parent
commit
12e1a64be4
  1. 1
      utils/templatetags/text_tags.py
  2. 12
      utils/translation.py

1
utils/templatetags/text_tags.py

@ -39,4 +39,3 @@ def nbsp(text, autoescape=True):
else: else:
esc = lambda x: x esc = lambda x: x
return mark_safe(WHITESPACE.sub(' ', esc(text.strip()))) return mark_safe(WHITESPACE.sub(' ', esc(text.strip())))

12
utils/translation.py

@ -18,16 +18,22 @@ from django.views.generic import TemplateView
from django.views.i18n import LANGUAGE_QUERY_PARAMETER from django.views.i18n import LANGUAGE_QUERY_PARAMETER
def lang_suffix(language_code=None): def get_language(language_code=None):
""" """
Returns the suffix appropriate for adding to field names for selecting Calls Django's translation.get_language but makes sure
the current language. that
""" """
if not language_code: if not language_code:
language_code = translation.get_language() language_code = translation.get_language()
if not language_code: if not language_code:
language_code = settings.LANGUAGE_CODE language_code = settings.LANGUAGE_CODE
language_code = language_code[:2] or 'de' # FIXME Fall back to default language language_code = language_code[:2] or 'de' # FIXME Fall back to default language
def lang_suffix(language_code=None):
"""
Returns the suffix appropriate for adding to field names for selecting
the current language.
"""
return "_%s" % language_code return "_%s" % language_code

Loading…
Cancel
Save