On Mon, 2014-01-27 at 10:22 -0500, David Shea wrote:
The last fix for this went missing, so let's try again.
Resolves: rhbz#1021849
---
pyanaconda/keyboard.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index a20e7de..8189082 100755
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -509,14 +509,20 @@ class XklWrapper(object):
"""
layout_info = self._layout_infos[layout_variant]
+
if with_lang and layout_info.lang:
+ lang =
iutil.upcase_first_letter(iso_(layout_info.lang).decode("utf-8"))
+ else:
+ lang = None
+
+ description = Xkb_(layout_info.desc).decode("utf-8")
+
+ if with_lang and lang and not description.startswith(lang):
# translate language and upcase its first letter, translate the
# layout-variant description
- xlated_lang = iso_(layout_info.lang)
- return "%s (%s)" %
(iutil.upcase_first_letter(xlated_lang.decode("utf-8")),
- Xkb_(layout_info.desc).decode("utf-8"))
+ return "%s (%s)" % (lang, description)
else:
- return layout_info.desc
+ return description
def get_switch_opt_description(self, switch_opt):
"""
This looks good to me. Could you just please add the
'ported HASH from
master' line for there reference? Thanks.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic