fix for canAllocateChannel

[enigma2.git] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index a7752274b530f6d7cca71bf19379f869312663c9..45de7abd4cf0cce751cefecb9c841bfef8bcb3e2 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -252,8 +252,8 @@ class ChannelSelectionBase(Screen):
 
                self.service_types = self.service_types_tv
 
-               self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
-               #self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+               #self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+               self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
 
                self["key_red"] = Button(_("All"))
                self["key_green"] = Button(_("Satellites"))
@@ -326,13 +326,13 @@ class ChannelSelectionBase(Screen):
                                else:
                                        service_name = _("Services")
                                try:
-                                       service_name += ' - %s'%(nimmanager.getSatDescription(orbpos))
-                                       service.setName(str(service_name)) # why we need this cast?
+                                       service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos)))
+                                       service.setName(service_name) # why we need this cast?
                                except:
                                        if orbpos > 1800: # west
-                                               service.setName("%s (%3.1fW)"%(str, (0 - (orbpos - 3600)) / 10.0))
+                                               service.setName("%s (%3.1f" + _("W") + ")" %(str, (0 - (orbpos - 3600)) / 10.0))
                                        else:
-                                               service.setName("%s (%3.1fE)"%(str, orbpos / 10.0))
+                                               service.setName("%s (%3.1f" + _("E") + ")" % (str, orbpos / 10.0))
                                self.servicelist.addService(service)
                self.servicelist.finishFill()