git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dump code in case of SIGSEGV
[enigma2.git]
/
lib
/
python
/
Components
/
Language.py
diff --git
a/lib/python/Components/Language.py
b/lib/python/Components/Language.py
index 076977158aef295f1ccc6359dc46983a14cfa79a..f08ae34bb1f75d9f448ed82440e433b030569163 100644
(file)
--- a/
lib/python/Components/Language.py
+++ b/
lib/python/Components/Language.py
@@
-7,18
+7,30
@@
class Language:
def __init__(self):
gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
self.activeLanguage = 0
def __init__(self):
gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
self.activeLanguage = 0
- self.lang = []
+ self.lang = {}
+ self.langlist = []
# FIXME make list dynamically
# name, iso-639 language, iso-3166 country. Please don't mix language&country!
self.addLanguage(_("English"), "en", "EN")
self.addLanguage(_("German"), "de", "DE")
self.addLanguage(_("Arabic"), "ar", "AE")
# FIXME make list dynamically
# name, iso-639 language, iso-3166 country. Please don't mix language&country!
self.addLanguage(_("English"), "en", "EN")
self.addLanguage(_("German"), "de", "DE")
self.addLanguage(_("Arabic"), "ar", "AE")
+ self.addLanguage(_("Danish"), "da", "DK")
self.addLanguage(_("Dutch"), "nl", "NL")
self.addLanguage(_("Dutch"), "nl", "NL")
+ self.addLanguage(_("Finnish"), "fi", "FI")
+ self.addLanguage(_("French"), "fr", "FR")
+ self.addLanguage(_("Icelandic"), "is", "IS")
+ self.addLanguage(_("Italian"), "it", "IT")
+ self.addLanguage(_("Norwegian"), "no", "NO")
self.addLanguage(_("Spanish"), "es", "ES")
self.addLanguage(_("Spanish"), "es", "ES")
+ self.addLanguage(_("Swedish"), "sv", "SE")
+ self.addLanguage(_("Turkish"), "tr", "TR")
+
+ self.callbacks = []
def addLanguage(self, name, lang, country):
try:
def addLanguage(self, name, lang, country):
try:
- self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+ self.lang[str(lang + "_" + country)] = ((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+ self.langlist.append(str(lang + "_" + country))
except:
print "Language " + str(name) + " not found"
except:
print "Language " + str(name) + " not found"
@@
-27,13
+39,24
@@
class Language:
print "Activating language " + str(self.lang[index][0])
self.lang[index][1].install()
self.activeLanguage = index
print "Activating language " + str(self.lang[index][0])
self.lang[index][1].install()
self.activeLanguage = index
+ for x in self.callbacks:
+ x()
except:
print "Selected language does not exist!"
except:
print "Selected language does not exist!"
-
+
def getLanguageList(self):
list = []
def getLanguageList(self):
list = []
- for x in self.lang:
- list.append(
x[0]
)
+ for x in self.lang
list
:
+ list.append(
(x, self.lang[x])
)
return list
return list
-
+
+ def getActiveLanguage(self):
+ return self.activeLanguage
+
+ def getLanguage(self):
+ return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])
+
+ def addCallback(self, callback):
+ self.callbacks.append(callback)
+
language = Language()
language = Language()