diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-11-06 09:10:15 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-11-06 09:10:15 +0000 |
| commit | 6ebe2f45ec609f3769a4a57e4bbbf776aa3cb930 (patch) | |
| tree | 05df301d0b366035278d063d7e812ac9c6146dbf | |
| parent | ccee5d9ea44a69fad9851dd3f286f3f28b6078d7 (diff) | |
| download | enigma2-6ebe2f45ec609f3769a4a57e4bbbf776aa3cb930.tar.gz enigma2-6ebe2f45ec609f3769a4a57e4bbbf776aa3cb930.zip | |
no bluescreen when language code not exist in ISO639.py
| -rw-r--r-- | lib/python/Screens/InfoBarGenerics.py | 5 | ||||
| -rw-r--r-- | lib/python/Screens/Subtitles.py | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 8cfa91ca..8224d20d 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -1342,9 +1342,8 @@ class InfoBarAudioSelection: language = i.getLanguage() description = i.getDescription() - if len(language) == 3: - if language in LanguageCodes: - language = LanguageCodes[language][0] + if LanguageCodes.has_key(language): + language = LanguageCodes[language][0] if len(description): description += " (" + language + ")" diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py index 043198c8..ac2937ff 100644 --- a/lib/python/Screens/Subtitles.py +++ b/lib/python/Screens/Subtitles.py @@ -30,12 +30,18 @@ class Subtitles(Screen, ConfigListScreen): else: text = _("Enable") if x[0] == 0: - self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x)) + if LanguageCodes.has_key(x[4]): + self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x)) + else: + self.list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x)) elif x[0] == 1: if x[4] == 'und': #undefined self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x)) else: - self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+LanguageCodes[x[4]][0], ConfigNothing(), x)) + if LanguageCodes.has_key(x[4]): + self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+LanguageCodes[x[4]][0], ConfigNothing(), x)) + else: + self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x)) # return _("Disable subtitles") self["config"].list = self.list self["config"].l.setList(self.list) |