X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ee34dc9997d200a8021332dd639c2cf3a92b21cd..cad37d2b523b91a00a58a9f53e0ba9bc7913c500:/lib/python/Screens/About.py

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 542bee6a..8270210a 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -4,29 +4,43 @@ from Components.Label import Label
 from Components.Harddisk import Harddisk
 from Components.NimManager import nimmanager
 from Components.MenuList import MenuList
+from Components.About import about
+
+from Tools.DreamboxHardware import getFPVersion
 
 class About(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		
-		self["text"] = Label("Enigma v2.0b")
+		self["text"] = Label("Enigma v" + about.getVersionString())
+
+		self["tuner"] = Label(_("Detected NIMs:"))
 
-		self["tuner"] = Label("Detected NIMs:")
+		fp_version = getFPVersion()
+		if fp_version is None:
+			fp_version = ""
+		else:
+			fp_version = _("Frontprocessor version: %d") % fp_version
+		
+		self["fpVersion"] = Label(fp_version)
 		
 		nims = nimmanager.nimList()
-		count = 0
-		for i in nims:
-			self["tuner" + str(count)] = Label(i[0])
-			count += 1
+		for count in range(2):
+			print "count:", nimmanager.nimCount
+			if count < nimmanager.nimCount:
+				self["tuner" + str(count)] = Label(nims[count][0])
+			else:
+				self["tuner" + str(count)] = Label("")
 
-		self["hdd"] = Label("Detected HDD:")
+		self["hdd"] = Label(_("Detected HDD:"))
 		hdd = Harddisk(0)
-		self["hddA"] = Label("%s (%s, %d MB free)" % (hdd.model(), hdd.capacity(),hdd.free()))
-		#self["hddA"] = Label("Seagate 398 GByte (323 GByte free)")
+		if hdd.model() != "":
+			self["hddA"] = Label(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
+		else:			
+			self["hddA"] = Label(_("none"))
 
 		self["actions"] = ActionMap(["SetupActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.close,
 			})
-	
\ No newline at end of file