From 12e1a64be4851adc3e8329ec8d9f5ab9990c04f4 Mon Sep 17 00:00:00 2001 From: Erik Stein Date: Sat, 1 Apr 2017 14:27:35 +0200 Subject: [PATCH] Improved utils.translation API. --- utils/templatetags/text_tags.py | 1 - utils/translation.py | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/utils/templatetags/text_tags.py b/utils/templatetags/text_tags.py index 1270a29..ef0c0b5 100644 --- a/utils/templatetags/text_tags.py +++ b/utils/templatetags/text_tags.py @@ -39,4 +39,3 @@ def nbsp(text, autoescape=True): else: esc = lambda x: x return mark_safe(WHITESPACE.sub(' ', esc(text.strip()))) - diff --git a/utils/translation.py b/utils/translation.py index 73f5a0a..e811003 100644 --- a/utils/translation.py +++ b/utils/translation.py @@ -18,16 +18,22 @@ from django.views.generic import TemplateView 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 - the current language. + Calls Django's translation.get_language but makes sure + that """ if not language_code: language_code = translation.get_language() if not language_code: language_code = settings.LANGUAGE_CODE 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