[PATCH 3/4] Sort layout descriptions properly

Vratislav Podzimek vpodzime at redhat.com
Sat Nov 9 14:45:27 UTC 2013


Layout descriptions are translated, so we should sort them according to the
locale-defined sorting rules.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/ui/gui/spokes/keyboard.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 9546cd2..0952c8f 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -31,6 +31,8 @@ from pyanaconda import flags
 from pyanaconda.i18n import _, N_, CN_
 from pyanaconda.constants import DEFAULT_KEYBOARD
 
+import locale as locale_mod
+
 import logging
 log = logging.getLogger("anaconda")
 
@@ -97,12 +99,7 @@ class AddLayoutDialog(GUIObject):
         show_str1 = self._xkl_wrapper.get_layout_variant_description(value1)
         show_str2 = self._xkl_wrapper.get_layout_variant_description(value2)
 
-        if show_str1 < show_str2:
-            return -1
-        elif show_str1 == show_str2:
-            return 0
-        else:
-            return 1
+        return locale_mod.strcoll(show_str1, show_str2)
 
     def refresh(self):
         self._entry.grab_focus()
-- 
1.8.3.1



More information about the anaconda-patches mailing list