Changeset 595

Timestamp:

08/27/10 17:40:00 (3 years ago)

Author:

jose.brandao

Message:

Fixing middleware for user locale settings and middleware order to make flatpages work with i18n

Location:

trunk/opentrials

Files:

• middleware/user_locale.py (modified) (1 diff)
• polyglot/models.py (modified) (1 diff)
• polyglot/templatetags/polyglot_tags.py (modified) (2 diffs)
• polyglot/tests/03-interface.txt (added)
• settings.py (modified) (1 diff)
• templates/base.html (modified) (1 diff)

trunk/opentrials/middleware/user_locale.py

@@ -12 +12 @@
 
     def process_request(self, request):
-        if request.user.is_authenticated():
-            language = request.user.get_profile().preferred_language
-            translation.activate(language)
-            request.LANGUAGE_CODE = translation.get_language()
-        else:
-            language = translation.get_language_from_request(request)
-            translation.activate(language)
-            request.LANGUAGE_CODE = translation.get_language()
+        if not request.session.get('django_language', None):
+            if request.user.is_authenticated():
+                language = request.user.get_profile().preferred_language
+                translation.activate(language)
+                request.LANGUAGE_CODE = translation.get_language()
+            else:
+                language = translation.get_language_from_request(request)
+                translation.activate(language)
+                request.LANGUAGE_CODE = translation.get_language()
 
     def process_response(self, request, response):

trunk/opentrials/polyglot/models.py

@@ -107 +107 @@
         return [field.name for field in trans_model._meta.fields if field.name not in ('id','language','content_type','object_id')]
 
+def get_ordered_languages(display_language, lower=False):
+    """Returns available languages ordered according to display language given"""
+
+    # Just sorts languages placing preferred language first
+    languages = ([lang[0] for lang in settings.MANAGED_LANGUAGES_CHOICES if lang[0] == display_language] +
+                 [lang[0] for lang in settings.MANAGED_LANGUAGES_CHOICES if lang[0] != display_language])
+    languages = map(str, languages)
+
+    if lower:
+        languages = map(lambda s: s.lower(), languages)
+
+    return languages
+

trunk/opentrials/polyglot/templatetags/polyglot_tags.py

@@ -1 +1 @@
 from django import template
-from django.conf import settings
+
+from polyglot.models import get_ordered_languages
 
 register = template.Library()
@@ -6 +7 @@
 class JSConstantsNode(template.Node):
     def render(self, context):
+        # It depends on 'request' template context processor
         display_language = context['request'].user.get_profile().preferred_language.lower()
 
-        ordered_languages = ([lang[0] for lang in settings.MANAGED_LANGUAGES_CHOICES if lang[0] == display_language] +
-                             [lang[0] for lang in settings.MANAGED_LANGUAGES_CHOICES if lang[0] != display_language])
-        ordered_languages = map(lambda s: s.lower(), map(str, ordered_languages))
+        ordered_languages = get_ordered_languages(display_language, lower=True)
 
-        default_second_language = ordered_languages[0] == 'en' and display_language or 'en'
+        # Default second language must be english
+        if len(ordered_languages) <= 1:
+            default_second_language = None
+        else:
+            default_second_language = ordered_languages[1]
 
         return """MULTILINGUAL_FIELDS = {

trunk/opentrials/settings.py

@@ -63 +63 @@
     'django.middleware.csrf.CsrfViewMiddleware',
     'middleware.scriptprefix.ScriptPrefixMiddleware',
-    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'middleware.user_locale.UserLocaleMiddleware',
+    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 )
 

trunk/opentrials/templates/base.html

@@ -124 +124 @@
                         {% csrf_token %}
                         <input type="hidden" id="language" name="language">
-                        <li><a id="lang_pt-BR" href="" title="{% trans 'Change language to Portuguese' %}">PT</a></li>
-                        <li><a id="lang_es" href="" title="{% trans 'Change language to Spanish' %}">ES</a></li>
-                        <li><a id="lang_en" href="" title="{% trans 'Change language to English' %}">EN</a></li>
+                        <li><a id="lang_pt-BR" href="javascript: void(0)" title="{% trans 'Change language to Portuguese' %}">PT</a></li>
+                        <li><a id="lang_es" href="javascript: void(0)" title="{% trans 'Change language to Spanish' %}">ES</a></li>
+                        <li><a id="lang_en" href="javascript: void(0)" title="{% trans 'Change language to English' %}">EN</a></li>
                     </ul>
                     </form>