X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b0e09a2cd9a05a002222d79fb71848f4c7820ff3..c06f79c0451ca844f89809058a2767a1a319b137:/lib/python/Components/ServiceScan.py

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 915a26a0..7cbc65db 100644
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -26,19 +26,25 @@ class ServiceScan:
 					self.state = self.Error
 					self.errorcode = errcode
 			else:
-				self.text.setText("scan in progress - %d %% done!\n%d services found!" % (self.scan.getProgress(), self.scan.getNumServices()))
+				self.text.setText(_("scan in progress - %d %% done!\n%d services found!") % (self.scan.getProgress(), self.scan.getNumServices()))
 		
 		if self.state == self.Done:
-			self.text.setText("scan done!")
+			if self.scan.getNumServices() == 1:
+				self.text.setText(_("scan done!\nOne service found!"))
+			elif self.scan.getNumServices() == 0:
+				self.text.setText(_("scan done!\nNo service found!"))
+			else:
+				self.text.setText(_("scan done!\n%d services found!") % (self.scan.getNumServices()))
 		
 		if self.state == self.Error:
-			self.text.setText("ERROR - failed to scan (%s)!" % (self.Errors[self.errorcode]) )
+			self.text.setText(_("ERROR - failed to scan (%s)!") % (self.Errors[self.errorcode]) )
 	
-	def __init__(self, progressbar, text, transponders, flags):
+	def __init__(self, progressbar, text, transponders, feid, flags):
 		self.progressbar = progressbar
 		self.text = text
 		self.scan = eComponentScan()
 		self.state = self.Idle
+		self.feid = feid
 		self.flags = flags
 		self.scanStatusChanged()
 		
@@ -74,7 +80,7 @@ class ServiceScan:
 	def execBegin(self):
 		self.scan.statusChanged.get().append(self.scanStatusChanged)
 		self.state = self.Running
-		err = self.scan.start(self.flags)
+		err = self.scan.start(self.feid, self.flags)
 		if err:
 			self.state = self.Error
 			self.errorcode = 0
@@ -85,8 +91,9 @@ class ServiceScan:
 		self.scan.statusChanged.get().remove(self.scanStatusChanged)
 		if not self.isDone():
 			print "*** warning *** scan was not finished!"
+		
+		del self.scan
 
 	def isDone(self):
 		print "state is %d " % (self.state)
 		return self.state == self.Done or self.state == self.Error
-