Merge lp:~daker/loco-team-portal/ld-languages-menu into lp:loco-team-portal

[Adnane Belmadiaf]

[lp:~daker/loco-team-portal/ld-languages-menu]

339. By Adnane Belmadiaf on 2010-12-04

* Removed the print statement

[Daniel Holbach (dholbach)]

Thanks a lot for your work on this.

A few things:
 - In loco_directory/common/utils.py sys and gettext are unnecessarily imported.
 - How often is check_for_language in loco_directory/common/utils.py executed? I get the feeling that it's even for a simple page called quite often (I just added a debug print message.) and every time it reads a bunch of directories and files. Is there a way how we can make this run less often?

review: Needs Information

[lp:~daker/loco-team-portal/ld-languages-menu]

340. By Adnane Belmadiaf on 2010-12-06

* Removed unused gettext import

[Adnane Belmadiaf (daker)]

1 - i removed the gettext import
2 - i can't figure out what's the best way to do it? maybe creating a cache array when you run the init-ld command, then we have just to look if the language code is in this array instead of reading all the directories in "locale".

[Michael Hall (mhall119)]

Put the 'languages' dict in utils.py outside of any function def, set it to None by default, then a method to return it, populating it if it's not already there, then call that method from the context processor:

loco_directory/common/utils.py

languages = None
def get_languages():
    """
    Return a language list.
    """
    if languages is None:
        languages = {}
        Languages = Language.objects.order_by('name')
        for language in Languages:
           if check_for_language(language.code):
                languages[language.code] = language.name
        languages = sorted([(value,key) for (key,value) in languages.items()])
    return languages

loco_directory/common/context_processors.py

import common.utils
def language_menu(request):
    return {'languages': common.utils.get_languages()}

[lp:~daker/loco-team-portal/ld-languages-menu]

341. By Adnane Belmadiaf on 2010-12-07

* Refactoring code to reduce the number of calls

[Michael Hall (mhall119)]

08:35 < mhall119> hmmm, it doesn't seem to let me change language
08:35 < mhall119> the menu stays on "Arabic" but the language is still English
08:35 < mhall119> and English (United States) isn't an option

review: Needs Fixing

Unmerged revisions

341. By Adnane Belmadiaf on 2010-12-07

* Refactoring code to reduce the number of calls

340. By Adnane Belmadiaf on 2010-12-06

* Removed unused gettext import

339. By Adnane Belmadiaf on 2010-12-04

* Removed the print statement

338. By Adnane Belmadiaf on 2010-12-04

* Fixed bug 648296
* Fixed bug 648293

=== modified file 'loco_directory/common/context_processors.py'
--- loco_directory/common/context_processors.py	2010-11-20 17:25:50 +0000
+++ loco_directory/common/context_processors.py	2010-12-07 16:30:21 +0000
@@ -3,6 +3,7 @@
 # to use this processor, add "common.context_processors.loco_version" to your variable TEMPLATE_CONTEXT_PROCESSORS in your settings file
 
 from django.conf import settings
+from utils import get_languages
 
 def loco_version(request):
     """
@@ -48,3 +49,9 @@
     from common.forms import SiteSearchForm
     search_form = SiteSearchForm(data=request.GET)
     return {'search_form': search_form}
+
+def language_menu(request):
+    """
+    Return the language list.
+    """
+    return {'languages': get_languages()}

=== modified file 'loco_directory/common/utils.py'
--- loco_directory/common/utils.py	2010-10-21 16:27:24 +0000
+++ loco_directory/common/utils.py	2010-12-07 16:30:21 +0000
@@ -1,10 +1,10 @@
+from django.conf import settings
 import email
 import os
-from copy import deepcopy
 import subprocess
 import datetime
-
-from django.conf import settings
+import sys
+from copy import deepcopy
 
 def write_log(job_name, log):
     stamp_dir = os.path.join(settings.PROJECT_PATH, 'data')
@@ -102,4 +102,31 @@
         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
 
+languages = None
+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 = sorted([(value,key) for (key,value) in languages.items()])
+    return languages

=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py	2010-11-30 12:54:39 +0000
+++ loco_directory/common/views.py	2010-12-07 16:30:21 +0000
@@ -3,9 +3,10 @@
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.contrib.auth import logout
-from django.utils.translation import check_for_language
 from django.conf import settings
 
+from utils import check_for_language
+
 def index(request):
     from events.models import GlobalEvent, TeamEvent
     team_event_count = TeamEvent.objects.next_events().count()
@@ -58,7 +59,8 @@
     if check_for_language(lang):
         if hasattr(request, 'session'):
             request.session['django_language'] = lang
-        response.set_cookie(settings.LANGUAGE_COOKIE_NAME,lang)
+        else:
+            response.set_cookie(settings.LANGUAGE_COOKIE_NAME,lang)
     return response
     
 def site_search(request):

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2010-12-06 16:38:37 +0000
+++ loco_directory/settings.py	2010-12-07 16:30:21 +0000
@@ -93,6 +93,7 @@
     "common.context_processors.login_redirect",
     "common.context_processors.url_base",
     "common.context_processors.site_search",
+    "common.context_processors.language_menu",
 )
 
 ROOT_URLCONF = 'loco_directory.urls'

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-11-20 17:25:50 +0000
+++ loco_directory/templates/base.html	2010-12-07 16:30:21 +0000
@@ -54,8 +54,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 LANGUAGE_CODE lang.1 %} selected="selected"{% endifequal %}>{{ lang.0 }}</option>
 			{% endfor %}
 		    </select>
 		</form>