aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-07-06 12:04:02 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-07-06 12:04:02 +0200
commitbd79491bea3049c1a90e465250a1021f50b7c010 (patch)
treea32379ea6e059d5d68699a21ffd060636067fe7e /lib/python/Components
parent0f69ce9a29482ed9e03067e83de4509346f90d7d (diff)
parent609d9cd18f7306c01c432e1ab4c71a5e60541f9c (diff)
downloadenigma2-bd79491bea3049c1a90e465250a1021f50b7c010.tar.gz
enigma2-bd79491bea3049c1a90e465250a1021f50b7c010.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Components')
-rw-r--r--lib/python/Components/Converter/MovieInfo.py4
-rw-r--r--lib/python/Components/Language.py1
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Components/Converter/MovieInfo.py b/lib/python/Components/Converter/MovieInfo.py
index d5995fe8..a973b41f 100644
--- a/lib/python/Components/Converter/MovieInfo.py
+++ b/lib/python/Components/Converter/MovieInfo.py
@@ -41,7 +41,9 @@ class MovieInfo(Converter, object):
rec_ref_str = info.getInfoString(service, iServiceInformation.sServiceref)
return ServiceReference(rec_ref_str).getServiceName()
elif self.type == self.MOVIE_REC_FILESIZE:
- return "%d MB" % (info.getInfoObject(service, iServiceInformation.sFileSize) / (1024*1024))
+ filesize = info.getInfoObject(service, iServiceInformation.sFileSize)
+ if filesize is not None:
+ return "%d MB" % (filesize / (1024*1024))
return ""
text = property(getText)
diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 268fdb21..657bea27 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -33,6 +33,7 @@ class Language:
self.addLanguage(_("Polish"), "pl", "PL")
self.addLanguage(_("Portuguese"), "pt", "PT")
self.addLanguage(_("Russian"), "ru", "RU")
+ self.addLanguage(_("Slovene"), "sl", "SI")
self.addLanguage(_("Spanish"), "es", "ES")
self.addLanguage(_("Swedish"), "sv", "SE")
self.addLanguage(_("Turkish"), "tr", "TR")