Index: django/conf/language_info.py
===================================================================
--- django/conf/language_info.py (revision 0)
+++ django/conf/language_info.py (revision 0)
@@ -0,0 +1,195 @@
+# This file was generated with django/bin/make-language-info.py and it is not
+# recommended to edit it by hand. For new translations, compile the new .po
+# files and edit the LANGUAGES setting, and finally re-run
+# django/bin/make-language-info.py to generate this file.
+
+language_info = {
+ 'ar': {'bidi': True,
+ 'language_code': 'ar',
+ 'name': 'Arabic',
+ 'name_local': u'Arabic'},
+ 'bg': {'bidi': False,
+ 'language_code': 'bg',
+ 'name': 'Bulgarian',
+ 'name_local': u'\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438'},
+ 'bn': {'bidi': False,
+ 'language_code': 'bn',
+ 'name': 'Bengali',
+ 'name_local': u'\u09ac\u09be\u0982\u09b2\u09be'},
+ 'ca': {'bidi': False,
+ 'language_code': 'ca',
+ 'name': 'Catalan',
+ 'name_local': u'Catal\xe0'},
+ 'cs': {'bidi': False,
+ 'language_code': 'cs',
+ 'name': 'Czech',
+ 'name_local': u'\u010desky'},
+ 'cy': {'bidi': False,
+ 'language_code': 'cy',
+ 'name': 'Welsh',
+ 'name_local': u'Cymraeg'},
+ 'da': {'bidi': False,
+ 'language_code': 'da',
+ 'name': 'Danish',
+ 'name_local': u'Dansk'},
+ 'de': {'bidi': False,
+ 'language_code': 'de',
+ 'name': 'German',
+ 'name_local': u'Deutsch'},
+ 'el': {'bidi': False,
+ 'language_code': 'el',
+ 'name': 'Greek',
+ 'name_local': u'\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac'},
+ 'en': {'bidi': False,
+ 'language_code': 'en',
+ 'name': 'English',
+ 'name_local': u'English'},
+ 'es': {'bidi': False,
+ 'language_code': 'es',
+ 'name': 'Spanish',
+ 'name_local': u'Espa\xf1ol'},
+ 'es-ar': {'bidi': False,
+ 'language_code': 'es-ar',
+ 'name': 'Argentinean Spanish',
+ 'name_local': u'Espa\xf1ol Argentino'},
+ 'eu': {'bidi': False,
+ 'language_code': 'eu',
+ 'name': 'Basque',
+ 'name_local': u'Basque'},
+ 'fa': {'bidi': True,
+ 'language_code': 'fa',
+ 'name': 'Persian',
+ 'name_local': u'Persian'},
+ 'fi': {'bidi': False,
+ 'language_code': 'fi',
+ 'name': 'Finnish',
+ 'name_local': u'suomi'},
+ 'fr': {'bidi': False,
+ 'language_code': 'fr',
+ 'name': 'French',
+ 'name_local': u'Fran\xe7ais'},
+ 'ga': {'bidi': False,
+ 'language_code': 'ga',
+ 'name': 'Irish',
+ 'name_local': u'Irish'},
+ 'gl': {'bidi': False,
+ 'language_code': 'gl',
+ 'name': 'Galician',
+ 'name_local': u'galego'},
+ 'he': {'bidi': True,
+ 'language_code': 'he',
+ 'name': 'Hebrew',
+ 'name_local': u'\u05e2\u05d1\u05e8\u05d9\u05ea - Hebrew'},
+ 'hr': {'bidi': False,
+ 'language_code': 'hr',
+ 'name': 'Croatian',
+ 'name_local': u'Hrvatski'},
+ 'hu': {'bidi': False,
+ 'language_code': 'hu',
+ 'name': 'Hungarian',
+ 'name_local': u'Magyar'},
+ 'is': {'bidi': False,
+ 'language_code': 'is',
+ 'name': 'Icelandic',
+ 'name_local': u'\xcdslenska'},
+ 'it': {'bidi': False,
+ 'language_code': 'it',
+ 'name': 'Italian',
+ 'name_local': u'Italiano'},
+ 'ja': {'bidi': False,
+ 'language_code': 'ja',
+ 'name': 'Japanese',
+ 'name_local': u'\u65e5\u672c\u8a9e'},
+ 'ka': {'bidi': False,
+ 'language_code': 'ka',
+ 'name': 'Georgian',
+ 'name_local': u'\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8'},
+ 'km': {'bidi': False,
+ 'language_code': 'km',
+ 'name': 'Khmer',
+ 'name_local': u'Khmer'},
+ 'kn': {'bidi': False,
+ 'language_code': 'kn',
+ 'name': 'Kannada',
+ 'name_local': u'Kannada'},
+ 'ko': {'bidi': False,
+ 'language_code': 'ko',
+ 'name': 'Korean',
+ 'name_local': u'\ud55c\uad6d\uc5b4'},
+ 'lv': {'bidi': False,
+ 'language_code': 'lv',
+ 'name': 'Latvian',
+ 'name_local': u'Latvie\u0161u'},
+ 'mk': {'bidi': False,
+ 'language_code': 'mk',
+ 'name': 'Macedonian',
+ 'name_local': u'\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438'},
+ 'nl': {'bidi': False,
+ 'language_code': 'nl',
+ 'name': 'Dutch',
+ 'name_local': u'Nederlands'},
+ 'no': {'bidi': False,
+ 'language_code': 'no',
+ 'name': 'Norwegian',
+ 'name_local': u'Norsk'},
+ 'pl': {'bidi': False,
+ 'language_code': 'pl',
+ 'name': 'Polish',
+ 'name_local': u'Polski'},
+ 'pt': {'bidi': False,
+ 'language_code': 'pt',
+ 'name': 'Portugese',
+ 'name_local': u'Portugese'},
+ 'pt-br': {'bidi': False,
+ 'language_code': 'pt-br',
+ 'name': 'Brazilian Portuguese',
+ 'name_local': u'Portugu\xeas Brasileiro'},
+ 'ro': {'bidi': False,
+ 'language_code': 'ro',
+ 'name': 'Romanian',
+ 'name_local': u'Romana'},
+ 'ru': {'bidi': False,
+ 'language_code': 'ru',
+ 'name': 'Russian',
+ 'name_local': u'\u0420\u0443\u0441\u0441\u043a\u0438\u0439'},
+ 'sk': {'bidi': False,
+ 'language_code': 'sk',
+ 'name': 'Slovak',
+ 'name_local': u'Slovensky'},
+ 'sl': {'bidi': False,
+ 'language_code': 'sl',
+ 'name': 'Slovenian',
+ 'name_local': u'Slovenski'},
+ 'sr': {'bidi': False,
+ 'language_code': 'sr',
+ 'name': 'Serbian',
+ 'name_local': u'Srpski'},
+ 'sv': {'bidi': False,
+ 'language_code': 'sv',
+ 'name': 'Swedish',
+ 'name_local': u'Svenska'},
+ 'ta': {'bidi': False,
+ 'language_code': 'ta',
+ 'name': 'Tamil',
+ 'name_local': u'\u0ba4\u0bae\u0bbf\u0bb4\u0bcd'},
+ 'te': {'bidi': False,
+ 'language_code': 'te',
+ 'name': 'Telugu',
+ 'name_local': u'Telugu'},
+ 'tr': {'bidi': False,
+ 'language_code': 'tr',
+ 'name': 'Turkish',
+ 'name_local': u'T\xfcrk\xe7e'},
+ 'uk': {'bidi': False,
+ 'language_code': 'uk',
+ 'name': 'Ukrainian',
+ 'name_local': u'Ukrainian'},
+ 'zh-cn': {'bidi': False,
+ 'language_code': 'zh-cn',
+ 'name': 'Simplified Chinese',
+ 'name_local': u'\u7b80\u4f53\u4e2d\u6587'},
+ 'zh-tw': {'bidi': False,
+ 'language_code': 'zh-tw',
+ 'name': 'Traditional Chinese',
+ 'name_local': u'\u7e41\u9ad4\u4e2d\u6587'}
+}
Property changes on: django/conf/language_info.py
___________________________________________________________________
Name: svn:eol-style
+ native
Index: django/templatetags/i18n.py
===================================================================
--- django/templatetags/i18n.py (revision 7438)
+++ django/templatetags/i18n.py (working copy)
@@ -17,6 +17,34 @@
context[self.variable] = [(k, translation.ugettext(v)) for k, v in settings.LANGUAGES]
return ''
+class GetLanguageInfoNode(Node):
+ def __init__(self, lang_code, variable):
+ self.lang_code = Variable(lang_code)
+ self.variable = variable
+
+ def render(self, context):
+ lang_code = self.lang_code.resolve(context)
+ context[self.variable] = translation.get_language_info(lang_code)
+ return ''
+
+class GetLanguageInfoListNode(Node):
+ def __init__(self, languages, variable):
+ self.languages = Variable(languages)
+ self.variable = variable
+
+ def get_language_info(self, language):
+ # ``language`` is either a language code string or a sequence with the
+ # language code as its first item
+ if len(language[0]) > 1:
+ return translation.get_language_info(language[0])
+ else:
+ return translation.get_language_info(str(language))
+
+ def render(self, context):
+ languages = self.languages.resolve(context)
+ context[self.variable] = [self.get_language_info(l) for l in languages]
+ return ''
+
class GetCurrentLanguageNode(Node):
def __init__(self, variable):
self.variable = variable
@@ -107,6 +135,55 @@
raise TemplateSyntaxError, "'get_available_languages' requires 'as variable' (got %r)" % args
return GetAvailableLanguagesNode(args[2])
+def do_get_language_info(parser, token):
+ """
+ This will store the language information dictionary for the given language
+ code in a context variable.
+
+ Usage::
+
+ {% get_language_info for language_code as l %}
+ {{ l.language_code }}
+ {{ l.name }}
+ {{ l.name_local }}
+ {{ l.bidi|yesno:"bi-directional,uni-directional" }}
+ """
+ args = token.contents.split()
+ if len(args) != 5 or args[1] != 'for' or args[3] != 'as':
+ raise TemplateSyntaxError, "'%s' requires 'for string as variable' (got %r)" % (args[0], args[1:])
+ return GetLanguageInfoNode(args[2], args[4])
+
+def do_get_language_info_list(parser, token):
+ """
+ This will store a list of language information dictionaries for the given
+ language codes in a context variable. The language codes can be specified
+ ither as a list of strings or a settings.LANGUAGES style tuple (or any
+ sequence of sequences whose first items are language codes).
+
+ Usage::
+
+ {% get_language_info_list for LANGUAGES as langs %}
+ {% for l in langs %}
+ {{ l.language_code }}
+ {{ l.name }}
+ {{ l.name_local }}
+ {{ l.bidi|yesno:"bi-directional,uni-directional" }}
+ {% endfor %}
+ """
+ args = token.contents.split()
+ if len(args) != 5 or args[1] != 'for' or args[3] != 'as':
+ raise TemplateSyntaxError, "'%s' requires 'for sequence as variable' (got %r)" % (args[0], args[1:])
+ return GetLanguageInfoListNode(args[2], args[4])
+
+def language_name(lang_code):
+ return translation.get_language_info(lang_code)['name']
+
+def language_name_local(lang_code):
+ return translation.get_language_info(lang_code)['name_local']
+
+def language_bidi(lang_code):
+ return translation.get_language_info(lang_code)['bidi']
+
def do_get_current_language(parser, token):
"""
This will store the current language in the context.
@@ -253,7 +330,13 @@
counter)
register.tag('get_available_languages', do_get_available_languages)
+register.tag('get_language_info', do_get_language_info)
+register.tag('get_language_info_list', do_get_language_info_list)
register.tag('get_current_language', do_get_current_language)
register.tag('get_current_language_bidi', do_get_current_language_bidi)
register.tag('trans', do_translate)
register.tag('blocktrans', do_block_translate)
+
+register.filter(language_name)
+register.filter(language_name_local)
+register.filter(language_bidi)
Index: django/utils/translation/__init__.py
===================================================================
--- django/utils/translation/__init__.py (revision 7438)
+++ django/utils/translation/__init__.py (working copy)
@@ -3,6 +3,10 @@
"""
from django.utils.functional import lazy
from django.utils.encoding import force_unicode
+try:
+ from django.conf.language_info import language_info
+except ImportError:
+ raise ImportError("Module django.conf.language_info not found. Run django/bin/make-language-info.py to generate it.")
__all__ = ['gettext', 'gettext_noop', 'gettext_lazy', 'ngettext',
'ngettext_lazy', 'string_concat', 'activate', 'deactivate',
@@ -109,3 +113,9 @@
"""
return u''.join([force_unicode(s) for s in strings])
string_concat = lazy(string_concat, unicode)
+
+def get_language_info(lang_code):
+ try:
+ return language_info[lang_code]
+ except KeyError:
+ raise KeyError("Unknown language code %r. If you have added a new translation, remember to add the language to the LANGUAGES setting and update the django/conf/language_info.py file by running django/bin/make-language-info.py." % lang_code)
Index: django/bin/make-language-info.py
===================================================================
--- django/bin/make-language-info.py (revision 0)
+++ django/bin/make-language-info.py (revision 0)
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+LANGUAGE_INFO_PY_FILE = 'django/conf/language_info.py'
+
+# Need to ensure that the i18n framework is enabled
+from django.conf import settings
+settings.configure(USE_I18N = True)
+
+TEMPLATE = """\
+# This file was generated with django/bin/make-language-info.py and it is not
+# recommended to edit it by hand. For new translations, compile the new .po
+# files and edit the LANGUAGES setting, and finally re-run
+# django/bin/make-language-info.py to generate this file.
+
+language_info = {
+ %s
+}
+"""
+
+def make_language_info(target_path):
+ print 'Writing language information to\n%s' % target_path
+ # Create a dummy language_info.py file to make sure we can import the
+ # translation module.
+ file(target_path, 'w').write(TEMPLATE % '')
+ from django.utils import translation
+ from pprint import pformat
+ language_info = {}
+ for code, name in settings.LANGUAGES:
+ translation.activate(code)
+ language_info[code] = {"language_code": code,
+ "name": name,
+ "name_local": translation.ugettext(name),
+ "bidi": code in settings.LANGUAGES_BIDI}
+ file(target_path, 'w').write(TEMPLATE % pformat(language_info)[1:-1])
+ # Because the timestamps of the dummy .pyc and real .py may fall on the
+ # same second, we must enforce compilation.
+ import py_compile
+ py_compile.compile(target_path)
+ print 'Done.'
+
+
+if __name__ == "__main__":
+ from os.path import join, dirname, abspath
+ path = abspath(join(dirname(__file__), '..', '..', LANGUAGE_INFO_PY_FILE))
+ make_language_info(path)
Property changes on: django/bin/make-language-info.py
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
Index: tests/regressiontests/i18n/tests.py
===================================================================
--- tests/regressiontests/i18n/tests.py (revision 7438)
+++ tests/regressiontests/i18n/tests.py (working copy)
@@ -1,5 +1,5 @@
# coding: utf-8
-import misc
+import misc, language_info
regressions = ur"""
Format string interpolation should work with *_lazy objects.
@@ -68,5 +68,6 @@
__test__ = {
'regressions': regressions,
+ 'language_info': language_info.tests,
'misc': misc.tests,
}
Index: tests/regressiontests/templates/tests.py
===================================================================
--- tests/regressiontests/templates/tests.py (revision 7438)
+++ tests/regressiontests/templates/tests.py (working copy)
@@ -755,6 +755,14 @@
'i18n17': ('{% load i18n %}{% blocktrans with anton|escape as berta %}{{ berta }}{% endblocktrans %}', {'anton': 'α & β'}, u'α & β'),
'i18n18': ('{% load i18n %}{% blocktrans with anton|force_escape as berta %}{{ berta }}{% endblocktrans %}', {'anton': 'α & β'}, u'α & β'),
+ # retrieving language information
+ 'i18n19': ('{% load i18n %}{% get_language_info for "de" as l %}{{ l.language_code }}: {{ l.name }}/{{ l.name_local }} bidi={{ l.bidi }}', {}, 'de: German/Deutsch bidi=False'),
+ 'i18n20': ('{% load i18n %}{% get_language_info for LANGUAGE_CODE as l %}{{ l.language_code }}: {{ l.name }}/{{ l.name_local }} bidi={{ l.bidi }}', {'LANGUAGE_CODE': 'fi'}, 'fi: Finnish/suomi bidi=False'),
+ 'i18n21': ('{% load i18n %}{% get_language_info_list for langcodes as langs %}{% for l in langs %}{{ l.language_code }}: {{ l.name }}/{{ l.name_local }} bidi={{ l.bidi }}; {% endfor %}', {'langcodes': ['it', 'no']}, 'it: Italian/Italiano bidi=False; no: Norwegian/Norsk bidi=False; '),
+ 'i18n22': ('{% load i18n %}{% get_language_info_list for langcodes as langs %}{% for l in langs %}{{ l.language_code }}: {{ l.name }}/{{ l.name_local }} bidi={{ l.bidi }}; {% endfor %}', {'langcodes': (('sl', 'Slovenian'), ('fa', 'Persian'))}, 'sl: Slovenian/Slovenski bidi=False; fa: Persian/Persian bidi=True; '),
+ 'i18n23': ('{% load i18n %}{{ "hu"|language_name }} {{ "hu"|language_name_local }} {{ "hu"|language_bidi }}', {}, 'Hungarian Magyar False'),
+ 'i18n24': ('{% load i18n %}{{ langcode|language_name }} {{ langcode|language_name_local }} {{ langcode|language_bidi }}', {'langcode': 'nl'}, 'Dutch Nederlands False'),
+
### HANDLING OF TEMPLATE_STRING_IF_INVALID ###################################
'invalidstr01': ('{{ var|default:"Foo" }}', {}, ('Foo','INVALID')),
Index: docs/i18n.txt
===================================================================
--- docs/i18n.txt (revision 7438)
+++ docs/i18n.txt (working copy)
@@ -266,7 +266,7 @@
Each ``RequestContext`` has access to three translation-specific variables:
* ``LANGUAGES`` is a list of tuples in which the first element is the
- language code and the second is the language name (in that language).
+ language code and the second is the language name (in English).
* ``LANGUAGE_CODE`` is the current user's preferred language, as a string.
Example: ``en-us``. (See "How language preference is discovered", below.)
* ``LANGUAGE_BIDI`` is the current language's direction. If True, it's a
@@ -640,6 +640,64 @@
.. _session: ../sessions/
.. _request object: ../request_response/#httprequest-objects
+Local names of languages
+========================
+
+The ``get_language_info()`` function provides detailed information about
+languages::
+
+ >>> form django.utils.translation import get_language_info
+ >>> l = get_language_info('de')
+ >>> print l['name'], l['name_local'], l['bidi']
+ German Deutsch False
+
+The ``name`` and ``name_local`` attributes of the dictionary contain the name
+of the language in English and the language itself, respectively. The ``bidi``
+attribute is True only for bi-directional languages.
+
+In templates, you can use special template tags or filters to retrieve the same
+information. To get information about a single language, use the
+``{% get_language_info %}`` tag::
+
+ {% get_language_info for LANGUAGE_CODE as lang %}
+ {% get_language_info for "pl" as lang %}
+
+You can then access the information::
+
+ Language code: {{ lang.language_code }}
+ Name of language: {{ lang.name_local }}
+ Name in English: {{ lang.name }}
+ Bi-directional: {{ lang.bidi }}
+
+You can also use the ``{% get_language_info_list %}`` template tag to retrieve
+information for a list of languages (e.g. active languages as specified in
+``settings.LANGUAGES``). See `The set_language redirect view`_ for an example
+of how to display a language selector using ``{% get_language_info_list %}``.
+
+In addition to ``settings.LANGUAGES`` style nested tuples,
+``{% get_language_info_list %}`` supports simple lists of language codes. If
+you do this in your view::
+
+ return render_to_response('mytemplate.html',
+ {'available_languages': ['en', 'es', 'fr']},
+ RequestContext(request))
+
+you can iterate those languages in the template::
+
+ {% get_language_info_list available_languages %}
+ {% for l in available_languages %} ... {% endfor %}
+
+There are also simple filters available for convenience:
+
+ * ``{{ LANGUAGE_CODE|language_name }}`` ("German")
+ * ``{{ LANGUAGE_CODE|language_name_local }}`` ("Deutsch")
+ * ``{{ LANGUAGE_CODE|bidi }}`` (False)
+
+The source of the language information is the ``django.conf.language_info``
+module. If you add a new translation, you should run the
+``django/bin/make-language-info.py`` script to insert the information for the
+added language.
+
Using translations in your own projects
=======================================
@@ -732,16 +790,20 @@
* If that's empty -- say, if a user's browser suppresses that header --
then the user will be redirected to ``/`` (the site root) as a fallback.
-Here's example HTML template code::
+Here's example HTML template code (see `Local names of languages`_ for more
+information)::
+ {% get_language_info_list for LANGUAGES as available_languages %}
Translations and JavaScript