Merge lp:~mvo/software-center/review-language-i18n into lp:software-center

[Michael Vogt]

This branch makes the language selection combo in the reviews widget nicer by adding a proper i18n name to it.

[Gary Lasker (gary-lasker)]

Hi mvo, thanks for this! So, this looks very cool, but I found one problem when I tried to test using the French locals as shown (I have French langpacks installed on my system):

  LANGUAGE=fr_FR.utf8 LC_ALL=fr_FR.utf8 PYTHONPATH=. python ./software-center

The issue that I see is that there is only a single combobox entry, for "All languages" (in English), and there is no option for "French". And even given that, I see only French reviews in the list:

  http://img811.imageshack.us/img811/506/logithqueubuntu026.png

So, I'm not sure if my test case is somehow not valid/complete, but I thought I'd note it here.

One last thing, this behavior is not coming with this branch. I observe the same in trunk at rev 2675.

Nevertheless, per our conversation in IRC, you'd like to hold off on this in order to fix this one bit, so I'll set this as "Needs Fixing" for tracking.

Thanks!

review: Needs Fixing

[lp:~mvo/software-center/review-language-i18n]

2676. By Michael Vogt on 2012-01-18

fix bug that Gary discovered when LANGUAGE is set to a non-working language and add test

[Gary Lasker (gary-lasker)]

C'est magnifique!

  http://img850.imageshack.us/img850/7659/logithqueubuntu027.png

review: Approve

=== modified file 'debian/control'
--- debian/control	2012-01-05 11:10:58 +0000
+++ debian/control	2012-01-18 19:55:41 +0000
@@ -21,6 +21,7 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
+         iso-codes,
          app-install-data (>= 0.4.0),
          aptdaemon (>= 0.40),
          software-center-aptdaemon-plugins,

=== modified file 'softwarecenter/i18n.py'
--- softwarecenter/i18n.py	2011-10-13 13:48:13 +0000
+++ softwarecenter/i18n.py	2012-01-18 19:55:41 +0000
@@ -16,6 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import locale
 import logging
 import os
 LOG = logging.getLogger(__name__)
@@ -26,14 +27,29 @@
 # can be abbreved
 FULL = ["pt_BR", 
         "zh_CN", "zh_TW"]
+
+def init_locale():
+    try:
+        locale.setlocale(locale.LC_ALL, "")
+        # we need this for bug #846038, with en_NG setlocale() is fine
+        # but the next getlocale() will crash (fun!)
+        locale.getlocale()
+    except:
+        LOG.exception("setlocale failed, resetting to C")
+        locale.setlocale(locale.LC_ALL, "C")
+
+
 def get_languages():
     """Helper that returns the split up languages"""
-    if not "LANGUAGE" in os.environ:
+    langs = []
+    if "LANGUAGE" in os.environ:
+        langs = os.environ["LANGUAGE"].split(":")
+        for lang in langs[:]:
+            if "_" in lang and not lang in FULL:
+                langs.remove(lang)
+    # fallback
+    if not langs:
         return [get_language()]
-    langs = os.environ["LANGUAGE"].split(":")
-    for lang in langs[:]:
-        if "_" in lang and not lang in FULL:
-            langs.remove(lang)
     return langs
 
 def get_language():
@@ -51,3 +67,16 @@
     if language in FULL:
         return language
     return language.split("_")[0]
+
+def langcode_to_name(langcode):
+    import xml.etree.ElementTree
+    from gettext import dgettext
+    for iso in ["iso_639_3", "iso_639"]:
+        path = os.path.join("/usr/share/xml/iso-codes/", iso+".xml")
+        if os.path.exists(path):
+            root = xml.etree.ElementTree.parse(path)
+            xpath = ".//iso_639_3_entry[@part1_code='%s']" % langcode
+            match = root.find(xpath)
+            if match is not None:
+                return dgettext(iso, match.attrib["name"])
+    return langcode

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-01-17 15:56:14 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-01-18 19:55:41 +0000
@@ -22,7 +22,6 @@
 
 import atexit
 import collections
-import locale
 import dbus
 import dbus.service
 from dbus.mainloop.glib import DBusGMainLoop
@@ -48,6 +47,7 @@
 # db imports
 from softwarecenter.db.application import Application
 from softwarecenter.db import DebFileApplication
+from softwarecenter.i18n import init_locale
 
 # misc imports
 from softwarecenter.plugin import PluginManager
@@ -187,15 +187,7 @@
         gettext.bindtextdomain("software-center", "/usr/share/locale")
         gettext.textdomain("software-center")
 
-        try:
-            locale.setlocale(locale.LC_ALL, "")
-            # we need this for bug #846038, with en_NG setlocale() is fine
-            # but the next getlocale() will crash (fun!)
-            locale.getlocale()
-        except:
-            LOG.exception("setlocale failed, resetting to C")
-            locale.setlocale(locale.LC_ALL, "C")
-
+        init_locale()
 
         if "SOFTWARE_CENTER_DEBUG_TABS" in os.environ:
             self.notebook_view.set_show_tabs(True)

=== modified file 'softwarecenter/ui/gtk3/widgets/reviews.py'
--- softwarecenter/ui/gtk3/widgets/reviews.py	2012-01-17 20:43:04 +0000
+++ softwarecenter/ui/gtk3/widgets/reviews.py	2012-01-18 19:55:41 +0000
@@ -39,7 +39,7 @@
     )
 
 
-from softwarecenter.i18n import get_languages
+from softwarecenter.i18n import get_languages, langcode_to_name
 
 from softwarecenter.netstatus import network_state_is_connected, get_network_watcher
 from softwarecenter.enums import (
@@ -55,6 +55,9 @@
 LOG_ALLOCATION = logging.getLogger("softwarecenter.ui.Gtk.get_allocation()")
 LOG = logging.getLogger(__name__)
 
+(COL_LANGNAME,
+ COL_LANGCODE) = range(2)
+
 class UIReviewsList(Gtk.VBox):
 
     __gsignals__ = {
@@ -127,10 +130,15 @@
         self.header.pack_end(self.sort_combo, False, False, 3)
 
         # change language
-        self.review_language = Gtk.ComboBoxText.new()
+        self.review_language = Gtk.ComboBox()
+        cell = Gtk.CellRendererText()
+        self.review_language.pack_start(cell, True)
+        self.review_language.add_attribute(cell, "text", COL_LANGNAME)
+        self.review_language_model = Gtk.ListStore(str, str)
         for lang in get_languages():
-            self.review_language.append_text(lang)
-        self.review_language.append_text(_('Any language'))
+            self.review_language_model.append( (langcode_to_name(lang), lang) )
+        self.review_language_model.append( (_('Any language'), 'any') )
+        self.review_language.set_model(self.review_language_model)
         self.review_language.set_active(0)
         self.review_language.connect(
             "changed", self._on_different_review_language_clicked)
@@ -307,9 +315,8 @@
         self.emit("different-review-language-clicked", language)
 
     def get_active_review_language(self):
-        language = self.review_language.get_active_text()
-        if language == _('Any language'):
-            language = 'any'
+        model = self.review_language.get_model()
+        language = model[self.review_language.get_active_iter()][COL_LANGCODE]
         return language
 
     def get_all_review_ids(self):

=== modified file 'test/gtk3/test_appdetailsview.py'
--- test/gtk3/test_appdetailsview.py	2012-01-17 21:25:58 +0000
+++ test/gtk3/test_appdetailsview.py	2012-01-18 19:55:41 +0000
@@ -108,6 +108,10 @@
         view.show_app(app)
         self.assertEqual(view._reviews_server_page, 1)
 
+    def test_human_readable_name_in_view(self):
+        model = self.view.reviews.review_language.get_model()
+        self.assertEqual(model[0][0], "English")
+
     def test_pkgstatus_bar(self):
         # make sure configure is run with the various states
         # test
@@ -155,7 +159,6 @@
                 "for state %s the function %s was not called" % (state, func))
             mock.reset()
 
-
     def test_switch_language_resets_page(self):
         self.view._reviews_server_page = 4
 

=== added file 'test/test_i18n.py'
--- test/test_i18n.py	1970-01-01 00:00:00 +0000
+++ test/test_i18n.py	2012-01-18 19:55:41 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+import os
+import unittest
+
+
+from testutils import setup_test_env
+setup_test_env()
+from softwarecenter.i18n import (
+    init_locale, get_language,  get_languages, langcode_to_name)
+
+class TestI18n(unittest.TestCase):
+    """ tests the sc i18n """
+
+    def test_langcode_to_name(self):
+        self.assertEqual(langcode_to_name("de"), "German")
+
+    def test_locale(self):
+        # needs lang + country code
+        os.environ["LANGUAGE"] = "zh_TW"
+        self.assertEqual(get_language(), "zh_TW")
+        # language only
+        os.environ["LANGUAGE"] = "fr_FR"
+        self.assertEqual(get_language(), "fr")
+        # not existing one
+        os.environ["LANGUAGE"] = "xx_XX"
+        self.assertEqual(get_language(), "en")
+        # LC_ALL, no language
+        del os.environ["LANGUAGE"]
+        os.environ["LC_ALL"] = "C"
+        os.environ["LANG"] = "C"
+        self.assertEqual(get_language(), "en")
+
+    def test_invalid_get_languages(self):
+        # set LANGUAGE to a invalid language and verify that it correctly
+        # falls back to english
+        os.environ["LANGUAGE"] = "yxy_YYY"
+        self.assertEqual(get_languages(), ["en"])
+
+    def test_init_locale(self):
+        import locale
+        os.environ["LANGUAGE"] = ""
+        os.environ["LANG"] = "en_US.UTF-8"
+        init_locale()
+        self.assertEqual(locale.getlocale(locale.LC_ALL), ("en_US", "UTF-8"))
+        
+
+
+if __name__ == "__main__":
+    import logging
+    logging.basicConfig(level=logging.DEBUG)
+    unittest.main()

=== modified file 'test/test_utils.py'
--- test/test_utils.py	2012-01-16 14:42:49 +0000
+++ test/test_utils.py	2012-01-18 19:55:41 +0000
@@ -10,7 +10,6 @@
                                   release_filename_in_lists_from_deb_line,
                                   get_http_proxy_string_from_libproxy,
                                   )
-from softwarecenter.i18n import get_language
 
 
 class TestSCUtils(unittest.TestCase):
@@ -28,22 +27,6 @@
         self.assertEqual(release_filename_in_lists_from_deb_line(debline),
                          "security.ubuntu.com_ubuntu_dists_maverick-security_Release")
 
-    def test_locale(self):
-        # needs lang + country code
-        os.environ["LANGUAGE"] = "zh_TW"
-        self.assertEqual(get_language(), "zh_TW")
-        # language only
-        os.environ["LANGUAGE"] = "fr_FR"
-        self.assertEqual(get_language(), "fr")
-        # not existing one
-        os.environ["LANGUAGE"] = "xx_XX"
-        self.assertEqual(get_language(), "en")
-        # LC_ALL, no language
-        del os.environ["LANGUAGE"]
-        os.environ["LC_ALL"] = "C"
-        os.environ["LANG"] = "C"
-        self.assertEqual(get_language(), "en")
-
     def test_get_http_proxy_from_gsettings(self):
         from softwarecenter.utils import get_http_proxy_string_from_gsettings
         # FIXME: do something more meaningful here once I figured out