Merge lp:~mvo/software-center/lp979013 into lp:software-center

[Michael Vogt]

This branch fixes the bug in the review display for the language environment:
LANGUAGE=es_MX:es_ES:es_AR:es_ES:en
(and similar environments that have only language_REGION and a generic fallback in the LANGUAGE environment).

To test:
$ LANGUAGE=es_MX:es_ES:es_AR:es_ES:en ./software-center gparted
and verify that the reviews loaded are in spanish, that the review language combobox says "espanol" instead of "ingles".

[Gary Lasker (gary-lasker)]

Very clever fix. :) Thanks for the test case above, and for the updated unit test!

review: Approve

=== modified file 'softwarecenter/backend/reviews/__init__.py'
--- softwarecenter/backend/reviews/__init__.py	2012-03-16 19:16:21 +0000
+++ softwarecenter/backend/reviews/__init__.py	2012-04-12 14:28:24 +0000
@@ -43,7 +43,7 @@
 from softwarecenter.db.categories import get_query_for_category
 from softwarecenter.db.database import Application, StoreDatabase
 import softwarecenter.distro
-from softwarecenter.i18n import get_language
+from softwarecenter.i18n import get_languages
 from softwarecenter.utils import (upstream_version_compare,
                                   uri_to_filename,
                                   get_person_from_config,
@@ -254,7 +254,7 @@
             bdb.DB_VERSION_MAJOR,
             bdb.DB_VERSION_MINOR)
 
-        self.language = get_language()
+        self.language = get_languages()[0]
         if os.path.exists(self.REVIEW_STATS_CACHE_FILE):
             try:
                 self.REVIEW_STATS_CACHE = pickle.load(

=== modified file 'softwarecenter/i18n.py'
--- softwarecenter/i18n.py	2012-03-15 10:43:13 +0000
+++ softwarecenter/i18n.py	2012-04-12 14:28:24 +0000
@@ -48,9 +48,11 @@
         for lang in langs[:]:
             if "_" in lang and not lang in FULL:
                 langs.remove(lang)
-    # fallback
-    if not langs:
-        return [get_language()]
+    # ensure the data from get_language() part of the result too
+    # (see LP: #979013)
+    from_get_language = get_language()
+    if not from_get_language in langs:
+        langs.insert(0, from_get_language)
     return langs
 
 

=== modified file 'test/test_i18n.py'
--- test/test_i18n.py	2012-02-02 10:20:17 +0000
+++ test/test_i18n.py	2012-04-12 14:28:24 +0000
@@ -42,6 +42,10 @@
         # falls back to english
         os.environ["LANGUAGE"] = "yxy_YYY"
         self.assertEqual(get_languages(), ["en"])
+        os.environ["LANGUAGE"] = "es_MX:es_ES:es_AR:es_ES:en"
+        os.environ["LANG"] = "es_MX.UTF-8"
+        self.assertEqual(get_languages(), ["es", "en"])
+        
 
     def test_init_locale(self):
         import locale