[f20-branch][PATCH] Don't show language twice for keyboard layouts (#1021907)

Vratislav Podzimek vpodzime at redhat.com
Tue Oct 22 14:01:48 UTC 2013


From: Jens Petersen <petersen at redhat.com>

Descriptions of many layouts start with the names of their languages. If that
happens, we don't need to show their language explicitly once more.
---
 pyanaconda/keyboard.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index 1911198..2bfdb00 100644
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -551,20 +551,18 @@ class XklWrapper(object):
         """
 
         layout_info = self._layout_infos[layout_variant]
+
+        # translate language and upcase its first letter, translate the
+        # layout-variant description
         if xlated:
+            lang = iutil.upcase_first_letter(iso_(layout_info.lang).decode("utf-8"))
             description = Xkb_(layout_info.desc).decode("utf-8")
         else:
+            lang = iutil.upcase_first_letter(layout_info.lang)
             description = layout_info.desc
 
-        if with_lang and layout_info.lang:
-            # translate language and upcase its first letter, translate the
-            # layout-variant description
-            if xlated:
-                lang = iso_(layout_info.lang).decode("utf-8")
-            else:
-                lang = layout_info.lang
-
-            return "%s (%s)" % (iutil.upcase_first_letter(lang), description)
+        if with_lang and lang and not description.startswith(lang):
+            return "%s (%s)" % (lang, description)
         else:
             return description
 
-- 
1.7.11.7



More information about the anaconda-patches mailing list