Ticket #4327: 0001-CP-language-section-display-language-country-each-in.patch

extensions/cpsection/language/view.py

@@ -25 +25 @@
 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)
+def _translate_language(language_name, language):
+    """Translate a language name in the given language
+
+    If no translation is found, return the language name English.
+
+    """
+    try:
+        # ISO 639 is the standard that specifies names of languages
+        translation = gettext.translation('iso_639', languages=[language])
+        return translation.gettext(language_name)
+    except IOError:
+        return language_name
+
+def _translate_country(country_name, language):
+    """Translate a country name in the given language
+
+    If no translation is found, return the country name English.
+
+    """
+    try:
+        # ISO 3166 is the standard that specifies names of countries
+        translation = gettext.translation('iso_3166', languages=[language])
+        return translation.gettext(country_name)
+    except IOError:
+        return country_name
 
 CLASS = 'Language'
 ICON = 'module-language'
@@ -101 +124 @@
 
         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))
+            description = '%s (%s)' % (_translate_language(language, code), \
+                _translate_country(country, code))
             store.append([code, description])
 
         combobox = Gtk.ComboBox(model=store)