X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ed40f6f85c9c07c3c1224ae20601082c0309a631..864bab84ceacbaa2cf2814aa74f1379a0b9c8426:/lib/python/Components/About.py

diff --git a/lib/python/Components/About.py b/lib/python/Components/About.py
index 2f3fec09..8e332e33 100644
--- a/lib/python/Components/About.py
+++ b/lib/python/Components/About.py
@@ -1,10 +1,14 @@
 from Tools.Directories import resolveFilename, SCOPE_SYSETC
+from enigma import getEnigmaVersionString
 
 class About:
 	def __init__(self):
 		pass
-	
+
 	def getVersionString(self):
+		return self.getImageVersionString()
+
+	def getImageVersionString(self):
 		try:
 			file = open(resolveFilename(SCOPE_SYSETC, 'image-version'), 'r')
 			lines = file.readlines()
@@ -15,15 +19,28 @@ class About:
 					#0120 2005 11 29 01 16
 					#0123 4567 89 01 23 45
 					version = splitted[1]
+					image_type = version[0] # 0 = release, 1 = experimental
+					major = version[1]
+					minor = version[2]
+					revision = version[3]
 					year = version[4:8]
 					month = version[8:10]
 					day = version[10:12]
-					
-					return '-'.join(["2.1", year, month, day])
+					date = '-'.join((year, month, day))
+					if image_type == '0':
+						image_type = "Release"
+						version = '.'.join((major, minor, revision))
+						return ' '.join((image_type, version, date))
+					else:
+						image_type = "Experimental"
+						return ' '.join((image_type, date))
 			file.close()
 		except IOError:
 			pass
 
 		return "unavailable"
-	
+
+	def getEnigmaVersionString(self):
+		return getEnigmaVersionString()
+
 about = About()