git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'progress' source, 'progress to text' converter
[enigma2.git]
/
lib
/
python
/
Components
/
Language.py
diff --git
a/lib/python/Components/Language.py
b/lib/python/Components/Language.py
index 6a224c8ac0bda2a05b219b3068d4e09c67246f85..e0094c7b7190961a83d1df7ba9d3376960bbeb6e 100644
(file)
--- a/
lib/python/Components/Language.py
+++ b/
lib/python/Components/Language.py
@@
-37,21
+37,26
@@
class Language:
def addLanguage(self, name, lang, country):
try:
def addLanguage(self, name, lang, country):
try:
- self.lang[str(lang + "_" + country)] = ((_(name),
gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]),
lang, country))
+ self.lang[str(lang + "_" + country)] = ((_(name), lang, country))
self.langlist.append(str(lang + "_" + country))
except:
print "Language " + str(name) + " not found"
def activateLanguage(self, index):
try:
self.langlist.append(str(lang + "_" + country))
except:
print "Language " + str(name) + " not found"
def activateLanguage(self, index):
try:
- print "Activating language " + str(self.lang[index][0])
- self.lang[index][1].install()
+ lang = self.lang[index]
+ print "Activating language " + lang[0]
+ gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang[1]]).install()
self.activeLanguage = index
for x in self.callbacks:
x()
except:
print "Selected language does not exist!"
self.activeLanguage = index
for x in self.callbacks:
x()
except:
print "Selected language does not exist!"
+ def activateLanguageIndex(self, index):
+ if index < len(self.langlist):
+ self.activateLanguage(self.langlist[index])
+
def getLanguageList(self):
list = []
for x in self.langlist:
def getLanguageList(self):
list = []
for x in self.langlist:
@@
-60,10
+65,16
@@
class Language:
def getActiveLanguage(self):
return self.activeLanguage
def getActiveLanguage(self):
return self.activeLanguage
+
+ def getActiveLanguageIndex(self):
+ for count in range(len(self.langlist)):
+ if self.langlist[count] == self.activeLanguage:
+ return count
+ return None
def getLanguage(self):
try:
def getLanguage(self):
try:
- return str(self.lang[self.activeLanguage][
2]) + "_" + str(self.lang[self.activeLanguage][3
])
+ return str(self.lang[self.activeLanguage][
1]) + "_" + str(self.lang[self.activeLanguage][2
])
except:
return ''
except:
return ''