Merge lp:~daker/loco-team-portal/fix.648296-648293 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed the Languages switcher

[lp:~daker/loco-team-portal/fix.648296-648293]

557. By Adnane Belmadiaf on 2012-11-09

* Remove print statement

558. By Adnane Belmadiaf on 2012-11-09

* Removed another print statement

559. By Adnane Belmadiaf on 2012-11-09

* Fixed a typo

=== modified file 'loco_directory/common/context_processors.py'
--- loco_directory/common/context_processors.py	2012-06-01 23:45:18 +0000
+++ loco_directory/common/context_processors.py	2012-11-09 23:49:20 +0000
@@ -1,8 +1,9 @@
-# context processors for loco-directory
-# see: http://docs.djangoproject.com/en/dev/ref/settings/#setting-TEMPLATE_CONTEXT_PROCESSORS
-# to use this processor, add "common.context_processors.loco_version" to your variable TEMPLATE_CONTEXT_PROCESSORS in your settings file
+# -*- coding: utf-8 -*-
 
 from django.conf import settings
+from django.utils.translation import to_locale, get_language
+
+from utils import get_languages
 
 
 def loco_version(request):
@@ -54,3 +55,10 @@
     from common.forms import SiteSearchForm
     search_form = SiteSearchForm(data=request.GET)
     return {'search_form': search_form}
+
+
+def languages_menu(request):
+    """
+    Return the languages list.
+    """
+    return {'languages': get_languages(), 'LOCALE': to_locale(get_language())}
\ No newline at end of file

=== modified file 'loco_directory/common/utils.py'
--- loco_directory/common/utils.py	2012-06-01 23:45:18 +0000
+++ loco_directory/common/utils.py	2012-11-09 23:49:20 +0000
@@ -1,11 +1,14 @@
+# -*- coding: utf-8 -*-
+
+import subprocess
+import datetime
 import email
 import os
 from copy import deepcopy
-import subprocess
-import datetime
-
 from django.conf import settings
 
+languages = None
+
 
 def write_log(job_name, log):
     stamp_dir = os.path.join(settings.PROJECT_PATH, 'data')
@@ -106,3 +109,33 @@
     def reset(self):
         self.index = -1
         return ''
+
+
+def check_for_language(lang_code):
+    """
+    Checks whether there is a global language file for the given language code.
+    """
+    globalpath = os.path.join(settings.PROJECT_PATH, 'locale')
+    for dirnames in os.listdir(globalpath):
+        if dirnames == lang_code:
+            for dirpath_local, dirnames_local, filenames in os.walk(os.path.join(globalpath, dirnames, 'LC_MESSAGES')):
+                 if 'django.mo' in filenames:
+                     return True
+                 else:
+                     return False
+
+def get_languages():
+    """
+    Return a language list.
+    """
+    global languages
+    if languages is None:
+        from teams.models import Language
+        languages = {}
+        Languages = Language.objects.order_by('name')
+        for language in Languages:
+           if check_for_language(language.code):
+                languages[language.code] = language.name
+        languages['en_US'] = 'English'
+        languages = sorted([(value,key) for (key,value) in languages.items()])
+    return languages

=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py	2012-06-01 23:45:18 +0000
+++ loco_directory/common/views.py	2012-11-09 23:49:20 +0000
@@ -4,8 +4,9 @@
 from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.contrib.auth import logout
+from django.conf import settings
+from django.utils import translation
 from django.utils.translation import check_for_language
-from django.conf import settings
 
 try:
     from django_openid_auth.exceptions import (
@@ -78,19 +79,25 @@
     return HttpResponseRedirect('/')
 
 
-def set_language(request):
+def set_language(request, next=None):
     """
     Change the language for a user
     """
-    next_url = request.META.get('HTTP_REFERER', None)
-    if not next_url:
-        next_url = '/'
-    response = HttpResponseRedirect(next_url)
-    lang = request.GET.get('lang', '')
-    if check_for_language(lang):
-        if hasattr(request, 'session'):
-            request.session['django_language'] = lang
-        response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang)
+    if not next:
+        next = request.REQUEST.get('next', None)
+    if not next:
+        next = request.META.get('HTTP_REFERER', None)
+        if not next:
+            next = '/'
+    response = HttpResponseRedirect(next)
+    if request.method == 'GET':
+        lang_code = request.GET.get('lang', '')
+        if  lang_code and check_for_language(lang_code):
+            if hasattr(request, 'session'):
+                request.session['django_language'] = lang_code
+            else:
+                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang_code)
+            translation.activate(lang_code)
     return response
 
 

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2012-11-05 21:16:15 +0000
+++ loco_directory/settings.py	2012-11-09 23:49:20 +0000
@@ -29,7 +29,7 @@
 
 # Check for necessary modules
 modules = {
-            'pytz': 'python-tz', 
+            'pytz': 'python-tz',
             'vobject': 'python-vobject',
           }
 
@@ -106,7 +106,6 @@
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 )
@@ -124,6 +123,7 @@
     "common.context_processors.login_redirect",
     "common.context_processors.url_base",
     "common.context_processors.site_search",
+    "common.context_processors.languages_menu",
 )
 
 ROOT_URLCONF = 'loco_directory.urls'

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2012-09-25 21:01:12 +0000
+++ loco_directory/templates/base.html	2012-11-09 23:49:20 +0000
@@ -81,8 +81,8 @@
         <form name="lang-switcher" style="text-align:right;" action="/language/" method="get">
         <input name="next" type="hidden" value="{{ request.path }}" />
             <select name="lang" onchange="document.forms['lang-switcher'].submit()">
-            {% for lang in LANGUAGES %}
-                <option value="{{ lang.0 }}"{% ifequal LANGUAGE_CODE lang.0 %} selected="selected"{% endifequal %}>{{ lang.1 }}</option>
+            {% for lang in languages %}
+                <option value="{{ lang.1 }}"{% ifequal LOCALE lang.1 %} selected="selected"{% endifequal %}>{{ lang.0 }}</option>
             {% endfor %}
             </select>
         </form>