diff --git a/src/Mod/Start/StartPage/StartPage.html b/src/Mod/Start/StartPage/StartPage.html
index 36a3bf2aa0..9227550771 100644
--- a/src/Mod/Start/StartPage/StartPage.html
+++ b/src/Mod/Start/StartPage/StartPage.html
@@ -1,9 +1,10 @@
-
+
+
T_TITLE
-
-
+
+
@@ -12,7 +13,7 @@
VERSIONSTRING
-
+
@@ -57,25 +58,25 @@
T_GENERALDOCUMENTATION
T_DESCR_USERHUB
T_DESCR_POWERHUB
T_DESCR_DEVHUB
T_DESCR_MANUAL
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index a19c46949c..20589363bf 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -148,19 +148,19 @@ def getInfo(filename):
if files[0] == "Document.xml":
doc = str(zfile.read(files[0]))
doc = doc.replace("\n"," ")
- r = re.findall("Property name=\"CreatedBy.*?String value=\"(.*?)\"\/>",doc)
+ r = re.findall("Property name=\"CreatedBy.*?String value=\"(.*?)\"/>",doc)
if r:
author = r[0]
# remove email if present in author field
if "<" in author:
author = author.split("<")[0].strip()
- r = re.findall("Property name=\"Company.*?String value=\"(.*?)\"\/>",doc)
+ r = re.findall("Property name=\"Company.*?String value=\"(.*?)\"/>",doc)
if r:
company = r[0]
- r = re.findall("Property name=\"License.*?String value=\"(.*?)\"\/>",doc)
+ r = re.findall("Property name=\"License.*?String value=\"(.*?)\"/>",doc)
if r:
lic = r[0]
- r = re.findall("Property name=\"Comment.*?String value=\"(.*?)\"\/>",doc)
+ r = re.findall("Property name=\"Comment.*?String value=\"(.*?)\"/>",doc)
if r:
descr = r[0]
if "thumbnails/Thumbnail.png" in files:
@@ -247,16 +247,16 @@ def buildCard(filename,method,arg=None):
if finfo[5]:
infostring += "\n\n" + encode(finfo[5])
if size:
- result += ''
result += ''
- result += '
'
+ result += ''
+ result += '
'
result += ''
result += '
'+encode(basename)+'
'
result += '
'+encode(author)+'
'
result += '
'+size+'
'
result += '
'
- result += ''
result += ''
+ result += ''
return result
@@ -298,6 +298,10 @@ def handle():
HTML = HTML.replace("CSS",CSS)
HTML = encode(HTML)
+ # set the language
+
+ HTML = HTML.replace("BCP47_LANGUAGE",QtCore.QLocale().bcp47Name())
+
# get the stylesheet if we are using one
if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetBool("UseStyleSheet",False):
@@ -370,17 +374,17 @@ def handle():
rfcount = rf.GetInt("RecentFiles",0)
SECTION_RECENTFILES = encode(""+TranslationTexts.T_RECENTFILES+"
")
SECTION_RECENTFILES += ""
- SECTION_RECENTFILES += ''
SECTION_RECENTFILES += '- '
+ SECTION_RECENTFILES += ''
if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetBool("NewFileGradient",False):
- SECTION_RECENTFILES += '
'
+ SECTION_RECENTFILES += '
'
else:
- SECTION_RECENTFILES += '
'
+ SECTION_RECENTFILES += '
'
SECTION_RECENTFILES += ''
SECTION_RECENTFILES += '
'+encode(TranslationTexts.T_CREATENEW)+'
'
SECTION_RECENTFILES += ''
- SECTION_RECENTFILES += ' '
SECTION_RECENTFILES += ''
+ SECTION_RECENTFILES += ''
for i in range(rfcount):
filename = rf.GetString("MRU%d" % (i))
SECTION_RECENTFILES += encode(buildCard(filename,method="LoadMRU.py?MRU=",arg=str(i)))
@@ -424,14 +428,12 @@ def handle():
# build IMAGE_SRC paths
- HTML = HTML.replace("IMAGE_SRC_USERHUB",'file:///'+os.path.join(resources_dir, 'images/userhub.png'))
- HTML = HTML.replace("IMAGE_SRC_POWERHUB",'file:///'+os.path.join(resources_dir, 'images/poweruserhub.png'))
- HTML = HTML.replace("IMAGE_SRC_DEVHUB",'file:///'+os.path.join(resources_dir, 'images/developerhub.png'))
- HTML = HTML.replace("IMAGE_SRC_MANUAL",'file:///'+os.path.join(resources_dir, 'images/manual.png'))
- HTML = HTML.replace("IMAGE_SRC_SETTINGS",'file:///'+os.path.join(resources_dir, 'images/settings.png'))
- imagepath= 'file:///'+os.path.join(resources_dir, 'images/installed.png')
- imagepath = imagepath.replace('\\','/') # replace Windows backslash with slash to make the path javascript compatible
- HTML = HTML.replace("IMAGE_SRC_INSTALLED",imagepath)
+ HTML = HTML.replace("IMAGE_SRC_USERHUB",'file:///'+os.path.join(resources_dir, 'images/userhub.png').replace('\\','/'))
+ HTML = HTML.replace("IMAGE_SRC_POWERHUB",'file:///'+os.path.join(resources_dir, 'images/poweruserhub.png').replace('\\','/'))
+ HTML = HTML.replace("IMAGE_SRC_DEVHUB",'file:///'+os.path.join(resources_dir, 'images/developerhub.png').replace('\\','/'))
+ HTML = HTML.replace("IMAGE_SRC_MANUAL",'file:///'+os.path.join(resources_dir, 'images/manual.png').replace('\\','/'))
+ HTML = HTML.replace("IMAGE_SRC_SETTINGS",'file:///'+os.path.join(resources_dir, 'images/settings.png').replace('\\','/'))
+ HTML = HTML.replace("IMAGE_SRC_INSTALLED",'file:///'+os.path.join(resources_dir, 'images/installed.png').replace('\\','/'))
# build UL_WORKBENCHES
@@ -481,7 +483,7 @@ def handle():
xpm = w.Icon
if "XPM" in xpm:
xpm = xpm.replace("\n ","\n") # some XPMs have some indent that QT doesn't like
- r = [s[:-1].strip('"') for s in re.findall("(?s)\{(.*?)\};",xpm)[0].split("\n")[1:]]
+ r = [s[:-1].strip('"') for s in re.findall("(?s){(.*?)};",xpm)[0].split("\n")[1:]]
p = QtGui.QPixmap(r)
p = p.scaled(24,24)
img = tempfile.mkstemp(dir=tempfolder,suffix='.png')[1]
@@ -492,7 +494,7 @@ def handle():
img = os.path.join(resources_dir,"images/freecad.png")
iconbank[wb] = img
UL_WORKBENCHES += '- '
- UL_WORKBENCHES += '
'
+ UL_WORKBENCHES += '
'
UL_WORKBENCHES += ''+wn.replace("ReverseEngineering","ReverseEng")+''
UL_WORKBENCHES += ' '
UL_WORKBENCHES += '
'