Release track names now have L10n

pandion · Nov 13, 2009 · 483c0b1 · 483c0b1
1 parent 507dda7
commit 483c0b1
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 7 deletions.
diff --git a/Client/css/about.css b/Client/css/about.css
@@ -52,6 +52,9 @@ a:hover {
 	font-size: 1em;
 	color: #333;
 }
+#software-track {
+	text-transform: lowercase;
+}
 #header p {
 	margin: 5px 0 0 20px;
 }

diff --git a/Client/css/autoupdate.css b/Client/css/autoupdate.css
@@ -79,6 +79,9 @@ a:hover {
 	margin: 7px 0 0 10px;
 	color: inactivecaptiontext;
 }
+#tracks-version-track, #progress-version-track {
+	text-transform: lowercase;
+}
 
 /* Panel: Tracks
  */
@@ -120,6 +123,15 @@ a:hover {
 	margin: 0 0 6px 0;
 	padding: 0;
 }
+.update-button .name, .update-button .number {
+	=margin-right: 4px; /* ie6/ie7 */
+}
+.update-button .name:after, .update-button .number:after {
+	content: " "; /* w3c */
+}
+.update-button .track {
+	text-transform: lowercase;
+}
 .update-button div {
 	color: highlight;
 	font-style: italic;

diff --git a/Client/js/about.js b/Client/js/about.js
@@ -12,7 +12,9 @@ window.attachEvent("onload", function () {
 	document.attachEvent("onkeydown", function () {if (event.keyCode == 27) external.wnd.close()});
 
 	document.getElementById("software-name").innerText = external.globals("softwarename");
-	document.getElementById("software-version").innerText = external.globals("softwareversion") + " " + external.globals("softwaretrack");
+	document.getElementById("software-number").innerText = external.globals("softwareversion");
+	document.getElementById("software-track").innerText = external.globals("Translator").Translate("main", "track-" + external.globals("softwaretrack"));
+	client.css.addClass(document.getElementById("software-track"), external.globals("softwaretrack"));
 	document.getElementById("software-link").innerText = document.getElementById("software-link").href = external.globals("softwareurl");
 
 	document.getElementById("content").attachEvent("onsubmit", function () {

diff --git a/Client/js/autoupdate.js b/Client/js/autoupdate.js
@@ -76,7 +76,9 @@ window.attachEvent("onload", function () {
 
 		document.getElementById("txt-version").innerText = external.globals("Translator").Translate("autoupdate", "title", [appcastEntry.name, appcastEntry.version]);
 		document.getElementById("txt-whats-new").href = appcastEntry.alternate ? appcastEntry.alternate : external.globals("ClientPluginContainer").ParseURL(external.globals("softwareurl"));
-		document.getElementById("progress-version").innerText = external.globals("softwareversion") + " " + external.globals("softwaretrack");
+		document.getElementById("progress-version-number").innerText = external.globals("softwareversion");
+		document.getElementById("progress-version-track").innerText = external.globals("Translator").Translate("main", "track-" + external.globals("softwaretrack"));
+		client.css.addClass(document.getElementById("progress-version-track"), external.globals("softwareversion"));
 		document.createElement("div").innerHTML = appcastEntry.summary;
 
 		if (appcastEntry.enclosure.length) {
@@ -186,7 +188,9 @@ window.attachEvent("onload", function () {
 
 	if (external.wnd.params.selectVersion) {
 		/* Load list of latest updates */
-		document.getElementById("tracks-version").innerText = external.globals("softwareversion") + " " + external.globals("softwaretrack");
+		document.getElementById("tracks-version-number").innerText = external.globals("softwareversion");
+		document.getElementById("tracks-version-track").innerText = external.globals("Translator").Translate("main", "track-" + external.globals("softwaretrack"));
+		client.css.addClass(document.getElementById("tracks-version-track"), external.globals("softwareversion"));
 		client.css.hide(document.getElementById("download-progress"));
 		client.css.hide(document.getElementById("txt-unavailable"));
 		client.css.hide(document.getElementById("txt-no-feed"));
@@ -218,7 +222,10 @@ window.attachEvent("onload", function () {
 					if (tracks[name]) {
 						var button = document.createElement("<button type='button' />");
 						button.className = "update-button";
-						insertSimpleElement(button, "h4", tracks[name].name + " " + tracks[name].version + " " + name);
+						var title = insertSimpleElement(button, "h4", "");
+						client.css.addClass(insertSimpleElement(title, "span", tracks[name].name), "name");
+						client.css.addClass(insertSimpleElement(title, "span", tracks[name].version), "number");
+						client.css.addClass(insertSimpleElement(title, "span", external.globals("Translator").Translate("main", "track-" + name)), "track");
 						if (tracks[name].version == external.globals("softwareversion")) {
 							button.disabled = true;
 							insertSimpleElement(button, "div", external.globals("Translator").Translate("autoupdate", "up-to-date"));

diff --git a/Client/languages/en.xml b/Client/languages/en.xml
@@ -278,6 +278,10 @@
     <code id="time-months">${0} months ago</code>
     <code id="time-year">1 year ago</code>
     <code id="time-years">${0} years ago</code>
+
+    <code id="track-stable">Stable</code>
+    <code id="track-beta">Beta</code>
+    <code id="track-development">Development</code>
   </window>
   <window name="about">
     <item id="txt-copyright">

diff --git a/Client/languages/nl.xml b/Client/languages/nl.xml
@@ -274,6 +274,10 @@
     <code id="time-months">${0} maanden geleden</code>
     <code id="time-year">1 jaar geleden</code>
     <code id="time-years">${0} jaren geleden</code>
+
+    <code id="track-stable">Stabiel</code>
+    <code id="track-beta">Bèta</code>
+    <code id="track-development">Ontwikkeling</code>
   </window>
   <window name="about">
     <item id="txt-copyright">

diff --git a/Client/src/about.html b/Client/src/about.html
@@ -12,6 +12,7 @@
 <link rel="stylesheet" type="text/css" href="../css/lib/meyerweb-reset.css" />
 <link rel="stylesheet" type="text/css" href="../css/about.css" />
 <script type="text/javascript" src="../js/lib/client.js"></script>
+<script type="text/javascript" src="../js/lib/client/css.js"></script>
 <script type="text/javascript" src="../js/lib/client/os/launchInBrowser.js"></script>
 <script type="text/javascript" src="../js/lib/client/os/registry.js"></script>
 <script type="text/javascript" src="../js/lib/client/html/anchorToBrowser.js"></script>
@@ -24,7 +25,10 @@
 	<div id="header">
 		<div id="logo"></div>
 		<h1 id="software-name"></h1>
-		<h2 id="software-version"></h2>
+		<h2 id="software-version">
+			<span id="software-number"></span>
+			<span id="software-track"></span>
+		</h2>
 		<p><a id="software-link"></a></p>
 	</div>
 	<div id="legal-notice">

diff --git a/Client/src/autoupdate.html b/Client/src/autoupdate.html
@@ -41,7 +41,10 @@ <h3 id="txt-alternatives"></h3>
 	</div>
 	<div class="footer">
 		<input type="submit" class="btn" id="btn-close" />
-		<div id="tracks-version"></div>
+		<div id="tracks-version">
+			<span id="tracks-version-number"></span>
+			<span id="tracks-version-track"></span>
+		</div>
 	</div>
 </form>
 
@@ -66,7 +69,10 @@ <h2 id="txt-new-version"></h2>
 		<input type="submit" class="btn" id="btn-later" />
 		<input type="button" class="btn wide" id="btn-download" />
 		<input type="button" class="btn wide" id="btn-update" />
-		<div id="progress-version"></div>
+		<div id="progress-version">
+			<span id="progress-version-number"></span>
+			<span id="progress-version-track"></span>
+		</div>
 	</div>
 </form>