Changeset 2911

Timestamp:

05/16/06 02:35:20 (3 years ago)

Author:

hugo

Message:

fixed #1660: added support functions and tags for bidi language support

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/templatetags/i18n.py (modified) (3 diffs)
• django/trunk/django/utils/translation.py (modified) (1 diff)

django/trunk/django/conf/global_settings.py

@@ -63 +63 @@
-)
-
+# Languages using BiDi (right-to-left) layout
+LANGUAGES_BIDI = ("he",)
+
-# Not-necessarily-technical managers of the site. They get broken link
-# notifications and other various e-mails.

django/trunk/django/templatetags/i18n.py

@@ -24 +24 @@
-        return ''
-
+class GetCurrentLanguageBidiNode(Node):
+    def __init__(self, variable):
+        self.variable = variable
+
+    def render(self, context):
+        context[self.variable] = translation.get_language_bidi()
+        return ''
+        
-class TranslateNode(Node):
-    def __init__(self, value, noop):
@@ -103 +111 @@
-    args = token.contents.split()
-    if len(args) != 3 or args[1] != 'as':
-available_languages
+current_language
-    return GetCurrentLanguageNode(args[2])
+
+def do_get_current_language_bidi(parser, token):
+    """
+    This will store the current language layout in the context.
+
+    Usage::
+
+        {% get_current_language_bidi as bidi %}
+
+    This will fetch the currently active language's layout and
+    put it's value into the ``bidi`` context variable.
+    True indicates right-to-left layout, otherwise left-to-right
+    """
+    args = token.contents.split()
+    if len(args) != 3 or args[1] != 'as':
+        raise TemplateSyntaxError, "'get_current_language_bidi' requires 'as variable' (got %r)" % args
+    return GetCurrentLanguageBidiNode(args[2])
-
-def do_translate(parser, token):
@@ -218 +243 @@
-register.tag('get_available_languages', do_get_available_languages)
-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)

django/trunk/django/utils/translation.py

@@ -213 +213 @@
-    return settings.LANGUAGE_CODE
-
+def get_language_bidi():
+    """
+    Returns selected language's BiDi layout.
+    False = left-to-right layout
+    True = right-to-left layout
+    """
+    
+    from django.conf import settings
+    return get_language() in settings.LANGUAGES_BIDI
+    
-def catalog():
-    """