Ticket #51: sl_51.patch

extensions/cpsection/language/model.py

@@ -21 +21 @@
 #
 
 import os
-from gettext import gettext as _
+import gettext
 import subprocess
+import operator
 
 _default_lang = 'en_US.utf8'
-_standard_msg = _("Could not access ~/.i18n. Create standard settings.")
+_standard_msg = \
+    gettext.gettext("Could not access ~/.i18n. Create standard settings.")
+
+def _translate_locale_info(language, territory, locale_code):
+    ''' 
+    Returns translated name of language and territory for 
+    locale specified by code
+    '''
+    lang_trans = gettext.translation('iso_639', languages=[locale_code], \
+        fallback = True)
+    territory_trans = gettext.translation('iso_3166', languages=[locale_code], \
+        fallback = True)
+    return (lang_trans.gettext(language), territory_trans.gettext(territory))
+
 
 def read_all_languages():
     fdp = subprocess.Popen(['locale', '-av'], stdout=subprocess.PIPE)
@@ -40 +54 @@
         elif line.find('territory |') != -1:
             territory = line.lstrip('territory |')
             if locale.endswith('utf8') and len(lang):
-                locales.append((lang, territory, locale))
+                trans_lang, trans_territory = _translate_locale_info(lang, \
+                    territory, locale)
+                locales.append((trans_lang, trans_territory, locale, lang))
 
     #FIXME: This is a temporary workaround for locales that are essential to 
     # OLPC, but are not in Glibc yet.
-    locales.append(('Kreyol', 'Haiti', 'ht_HT.utf8'))
-    locales.append(('Dari', 'Afghanistan', 'fa_AF.utf8'))
-    locales.append(('Pashto', 'Afghanistan', 'ps_AF.utf8'))
+    locales.append(('Kreyol', 'Haiti', 'ht_HT.utf8', 'Kreyol'))
+    locales.append(('Dari', 'Afghanistan', 'fa_AF.utf8', 'Dari'))
+    locales.append(('Pashto', 'Afghanistan', 'ps_AF.utf8', 'Pashto'))
 
-    locales.sort()
+    locales.sort(key=operator.itemgetter(3))
     return locales
 
 def _initialize():      
@@ -121 +137 @@
                 found_lang = True
                 break
         if not found_lang:
-            print (_("Language for code=%s could not be determined.") % code)
+            print (gettext.gettext("Language for code=%s could not \
+                be determined.") % code)
     
 def set_languages(languages):
     """Set the system language.
@@ -141 +158 @@
                 if code == languages:
                     _write_i18n(locale)
                     return 1
-            print (_("Sorry I do not speak \'%s\'.") % languages)
+            print (gettext.gettext("Sorry I do not speak \'%s\'.") % languages)
     else:
         _write_i18n(languages)
 

extensions/cpsection/language/view.py

@@ -24 +24 @@
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
 
-_translate_language = lambda msg: gettext.dgettext('iso_639', msg) 
-_translate_country = lambda msg: gettext.dgettext('iso_3166', msg)
-
 CLASS = 'Language'
 ICON = 'module-language'
 TITLE = gettext.gettext('Language')
@@ -82 +79 @@
         
                 
         store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-        for language, country, code in self._available_locales:
-            description = '%s (%s)' % (_translate_language(language), \
-                _translate_country(country))
+        for tr_lang, tr_territory, code, lang in self._available_locales:
+            description = '%s (%s)' % (tr_lang, tr_territory)
             store.append([code, description])
 
         combobox = gtk.ComboBox(model=store)