summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lang-table2
-rw-r--r--textw/keyboard_text.py5
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e5fff39a..aade86ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-09-21 Jeremy Katz <katzj@redhat.com>
+ * textw/keyboard_text.py (KeyboardWindow.__call__): Be more
+ tolerant of bad keyboard being specified
+
+ * lang-table: Fix traceback for Romanian (#292091)
+
* yuminstall.py (YumBackend.doRepoSetup): Don't explicitly call
tssetup/rpmsetup anymore. They happen as needed and then we can
catch the exception on doing repo setup (#295381)
diff --git a/lang-table b/lang-table
index fc1917ae4..c50df0e30 100644
--- a/lang-table
+++ b/lang-table
@@ -39,7 +39,7 @@ Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl2 Europe/Warsaw
Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon
Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo
Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta
-Romanian ro latarcyrheb-sun16 ro_RO.UTF_8 ro Europe/Bucharest
+Romanian ro latarcyrheb-sun16 ro_RO.UTF_8 ro_win Europe/Bucharest
Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow
Serbian sr latarcyrheb-sun16 sr_RS.UTF-8 sr-cy Europe/Belgrade
Serbian(Latin) sr@latin latarcyrheb-sun16 sr_RS.UTF-8@latin sr-latin Europe/Belgrade
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py
index 0a5bdd4d1..41e8ccf5b 100644
--- a/textw/keyboard_text.py
+++ b/textw/keyboard_text.py
@@ -33,6 +33,9 @@ class KeyboardWindow:
else:
default = anaconda.id.instLanguage.getDefaultKeyboard()
+ if default not in keyboards:
+ default = 'us'
+
(button, choice) = \
ListboxChoiceWindow(screen, _("Keyboard Selection"),
_("Which model keyboard is attached to this computer?"), keyboards,
@@ -43,7 +46,7 @@ class KeyboardWindow:
return INSTALL_BACK
anaconda.id.keyboard.set (keyboards[choice])
- anaconda.id.keyboard.beenset = 1
+ anaconda.id.keyboard.beenset = 1
anaconda.id.keyboard.activate()