summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--language.py7
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b6676ce62..87475af2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
* language.py (InstallTimeLanguage.setSupported): supported is a list
of language names, not nicknames.
+ * language.py (InstallTimeLanguage.setDefault): Fix check for if we
+ got a match or not.
* loader2/lang.c (loadLanguageList): Language names may now contain
spaces, which sscanf splits on. Change what it's looking for.
diff --git a/language.py b/language.py
index f7c8e2913..8f9851154 100644
--- a/language.py
+++ b/language.py
@@ -189,20 +189,21 @@ class InstallTimeLanguage:
return 'English (USA)'
def setDefault(self, nick):
- log ("starting setDefault")
if not nick:
self.default = None
return
# Try to find a match for the language nick we were given.
+ name = None
for k in self.langInfoByName.keys():
row = self.langInfoByName[k]
if nick in expandLangs(row[0]):
name = k
# It's possible we didn't find a match.
- self.default = None
- return
+ if name == None:
+ self.default = None
+ return
self.default = name
(lang, map, font) = self.langInfoByName[name]