summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--language.py6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e17bf5814..a3f91ea0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-28 Chris Lumens <clumens@redhat.com>
+
+ * language.py (setDefault): Check all forms of the language nick in
+ case someone's specified a shorter one.
+
2005-03-28 Peter Jones <pjones@redhat.com>
* lvm.py (lvlist,vglist,pvlist): make lvm list functions use
diff --git a/language.py b/language.py
index c4bc868e0..9fc0ecbfc 100644
--- a/language.py
+++ b/language.py
@@ -198,9 +198,13 @@ class InstallTimeLanguage:
# Try to find a match for the language nick we were given.
for k in self.langInfoByName.keys():
row = self.langInfoByName[k]
- if row[0] == nick:
+ if nick in expandLangs(row[0]):
name = k
+ # It's possible we didn't find a match.
+ self.default = None
+ return
+
self.default = name
(lang, map, font) = self.langInfoByName[name]