Merge lp:~mterry/ubiquity/sort-lang into lp:ubiquity

[Michael Terry]

[Michael Terry (mterry)]

Sort language list according to 'C' locale if pyicu is available. Colin and I chatted about this on IRC, and we figured that although this isn't going to be right for any given language, it's the best we can do, since we don't know the user's language yet!

=== modified file 'debian/changelog'
--- debian/changelog	2009-07-16 13:18:57 +0000
+++ debian/changelog	2009-07-16 17:39:38 +0000
@@ -8,7 +8,10 @@
   [ Evan Dandrea ]
   * Add support for ubiquity-slideshow.
 
- -- Colin Watson <[e-mail]>  Wed, 15 Jul 2009 15:37:49 +0100
+  [ Michael Terry ]
+  * Sort language list with pyicu, if available
+
+ -- Michael Terry <[e-mail]>  Thu, 16 Jul 2009 13:03:32 -0400
 
 ubiquity (1.99.0) karmic; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2009-07-15 14:06:31 +0000
+++ debian/control	2009-07-16 17:39:38 +0000
@@ -12,6 +12,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf (>= 1.4.72ubuntu5), ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python-apt (>= 0.6.16.2ubuntu4), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ${partman-depends}, ecryptfs-utils
 Recommends: ${bootloader-recommends}
+Suggests: python-pyicu
 Conflicts: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot
 Replaces: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot, ubiquity-frontend-gtk (<< 0.99.82)
 XB-Python-Version: ${python:Versions}

=== modified file 'ubiquity/components/language.py'
--- ubiquity/components/language.py	2009-06-24 13:57:01 +0000
+++ ubiquity/components/language.py	2009-07-16 17:39:38 +0000
@@ -26,6 +26,11 @@
 from ubiquity import im_switch
 from ubiquity import misc
 
+try:
+    import PyICU
+except:
+    PyICU = None
+
 class Language(FilteredCommand):
     def prepare(self, unfiltered=False):
         self.language_question = None
@@ -71,14 +76,29 @@
                 i += 1
             languagelist.close()
 
-            def compare_choice(x, y):
-                result = cmp(language_display_map[x][1],
-                             language_display_map[y][1])
-                if result != 0:
-                    return result
-                return cmp(x, y)
-
-            sorted_choices = sorted(language_display_map, compare_choice)
+            try:
+                # Note that we always collate with the 'C' locale.  This is far
+                # from ideal.  But proper collation always requires a specific
+                # language for its collation rules (languages frequently have
+                # custom sorting).  This at least gives us common sorting rules,
+                # like stripping accents.
+                collator = PyICU and PyICU.Collator.createInstance(PyICU.Locale('C'))
+            except:
+                collator = None
+
+            def compare_choice(x):
+                if language_display_map[x][1] == 'C':
+                    return None # place C first
+                if collator:
+                    try:
+                        return collator.getCollationKey(x).getByteArray()
+                    except:
+                        pass
+                # Else sort by unicode code point, which isn't ideal either,
+                # but also has the virtue of sorting like-glyphs together
+                return x
+
+            sorted_choices = sorted(language_display_map, key=compare_choice)
             self.frontend.set_language_choices(sorted_choices,
                                                language_display_map)
             self.frontend.set_language(current_language)