Adapted from 291e12cb0233905e413f34d5289c73a7df1d19a7. Many layout
descriptions include the layout name, so there's no need to add the
language again in that case.
Resolves: rhbz#1021849
---
pyanaconda/keyboard.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index 81b1388..c8e1924 100755
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -465,7 +465,7 @@ class XklWrapper(object):
#if this layout has already been added for some other language,
#do not add it again (would result in duplicates in our lists)
if name not in self.name_to_show_str:
- if lang:
+ if lang and not description.startswith(lang):
self.name_to_show_str[name] = "%s (%s)" %
(lang.encode("utf-8"),
description.encode("utf-8"))
else:
--
1.8.4.2
Show replies by date
Adapted from 291e12cb0233905e413f34d5289c73a7df1d19a7. Many layout
descriptions include the layout name, so there's no need to add the
language again in that case.
Resolves: rhbz#1021849
ACK.
- Chris