Merge lp:~mvo/software-center/rfc3166-use-common-name into lp:software-center

[Michael Vogt]

This small branch ensures that "common_name" in rfc3166 is used when available to avoid political issues around the name of the region.

[Gary Lasker (gary-lasker)]

Nice!! This is a great thing to have. Thanks mvo!

review: Approve

=== modified file 'softwarecenter/region.py'
--- softwarecenter/region.py	2012-02-03 09:42:18 +0000
+++ softwarecenter/region.py	2012-02-15 08:55:46 +0000
@@ -48,7 +48,10 @@
                 xpath = ".//%s_entry[@alpha_2_code='%s']" % (iso, countrycode)
                 match = root.find(xpath)
                 if match is not None:
-                    return dgettext(iso, match.attrib["name"])
+                    name = match.attrib.get("common_name")
+                    if not name:
+                        name = match.attrib["name"]
+                    return dgettext(iso, name)
     return ""
 
 # the first parameter of SetRequirements

=== modified file 'test/test_region.py'
--- test/test_region.py	2012-02-02 20:33:37 +0000
+++ test/test_region.py	2012-02-15 08:55:46 +0000
@@ -7,7 +7,7 @@
 
 from testutils import setup_test_env
 setup_test_env()
-from softwarecenter.region import RegionDiscover
+from softwarecenter.region import RegionDiscover, get_region_name
 from softwarecenter.i18n import init_locale
 
 class TestRegion(unittest.TestCase):
@@ -24,6 +24,10 @@
         self.assertEqual(res["country"], "Zambia")
         os.environ["LANG"] = ""
 
+    def test_get_region_name(self):
+        self.assertEqual(get_region_name("BO"), "Bolivia")
+        self.assertEqual(get_region_name("DE"), "Germany")
+
     def test_get_region_geoclue(self):
         res = self.region._get_region_geoclue()
         self.assertNotEqual(len(res), 0)