add ability to filter by tag. they must be created by hand right now.

[enigma2.git] / lib / python / Components / config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 44acacddf4472c7c13e081be0e3fc28ead5c389b..3c01794ab0fdcf92e15a85313a9caae7ad434262 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -194,10 +194,16 @@ class ConfigSelection(ConfigElement):
                        self.value = self.choices[(i + 1) % nchoices]
 
        def getText(self):
-               return _(self.description[self.value])
+               descr = self.description[self.value]
+               if len(descr):
+                       return _(descr)
+               return descr
 
        def getMulti(self, selected):
-               return ("text", _(self.description[self.value]))
+               descr = self.description[self.value]
+               if len(descr):
+                       return ("text", _(descr))
+               return ("text", descr)
 
        # HTML
        def getHTML(self, id):
@@ -229,12 +235,18 @@ class ConfigBoolean(ConfigElement):
                        self.value = not self.value
 
        def getText(self):
-               return _(self.descriptions[self.value])
+               descr = self.descriptions[self.value]
+               if len(descr):
+                       return _(descr)
+               return descr
 
        def getMulti(self, selected):
-               return ("text", _(self.descriptions[self.value]))
+               descr = self.descriptions[self.value]
+               if len(descr):
+                       return ("text", _(descr))
+               return ("text", descr)
 
-       def tostring(self, value):
+       def tostring(self, value):
                if not value:
                        return "false"
                else:
@@ -285,7 +297,6 @@ class ConfigDateTime(ConfigElement):
                if key == KEY_RIGHT:
                        self.value = self.value + self.increment
 
-
        def getText(self):
                return time.strftime(self.formatstring, time.localtime(self.value))
 
@@ -886,8 +897,9 @@ configfile = ConfigFile()
 
 configfile.load()
 
-def getConfigListEntry(desc, config):
-       return (desc, config)
+def getConfigListEntry(*args):
+       assert len(args) > 1, "getConfigListEntry needs a minimum of two arguments (descr, configElement)"
+       return args
 
 #def _(x):
 #      return x