From 580ebc105678c6d01cf64e7d75116d77984024a0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 11 Aug 2017 00:28:41 +0200 Subject: Replace display version in about box with build ID. --- browser/base/content/aboutDialog.js | 15 ++++++++------- browser/base/content/aboutDialog.xul | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'browser/base/content') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index b024d2d52..55d8ff262 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -40,16 +40,17 @@ function init(aEvent) // Pref is unset } - // Include the build ID and display warning if this is an "a#" (nightly or aurora) build + // Include the build ID let versionField = document.getElementById("version"); let version = Services.appinfo.version; + let buildID = Services.appinfo.appBuildID; + let year = buildID.slice(0, 4); + let month = buildID.slice(4, 6); + let day = buildID.slice(6, 8); + versionField.textContent = buildID + ` (${year}-${month}-${day})`; + + // Display warning if this is an "a#" (nightly or aurora) build if (/a\d+$/.test(version)) { - let buildID = Services.appinfo.appBuildID; - let year = buildID.slice(0, 4); - let month = buildID.slice(4, 6); - let day = buildID.slice(6, 8); - versionField.textContent += ` (${year}-${month}-${day})`; - document.getElementById("experimental").hidden = false; document.getElementById("communityDesc").hidden = true; } diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index ef2804f31..7988c0e34 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -45,7 +45,7 @@ -#expand +#expand #ifndef NIGHTLY_BUILD #endif -- cgit v1.2.3 From 49e8a36e170da3066d7c0216fca272ecac988102 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 11 Aug 2017 20:02:04 +0200 Subject: Link about dialog version to general.useragent.appVersionIsBuildID. true: YYYY.MM.DD.HHMM false: v{internal version number} (YYYY-MM-DD) --- browser/base/content/aboutDialog.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'browser/base/content') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 55d8ff262..04384d584 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -47,7 +47,13 @@ function init(aEvent) let year = buildID.slice(0, 4); let month = buildID.slice(4, 6); let day = buildID.slice(6, 8); - versionField.textContent = buildID + ` (${year}-${month}-${day})`; + let hour = buildID.slice(8, 10); + let minute = buildID.slice(10, 12); + if (Services.prefs.getBoolPref("general.useragent.appVersionIsBuildID")) { + versionField.textContent = `${year}.${month}.${day}.${hour}${minute}`; + } else { + versionField.textContent = `v` + version + ` (${year}-${month}-${day})`; + } // Display warning if this is an "a#" (nightly or aurora) build if (/a\d+$/.test(version)) { -- cgit v1.2.3 From 8896ca5c0a7b8bc6a086bf60d67b14fca5488dc8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 12 Aug 2017 00:48:59 +0200 Subject: Update various texts and references. --- browser/base/content/aboutDialog.xul | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'browser/base/content') diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index 7988c0e34..b77896b95 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -47,7 +47,7 @@ #expand #ifndef NIGHTLY_BUILD - +#expand #endif @@ -120,19 +120,13 @@ - &community.start2;&community.middle2;&community.end3; + Basilisk is community software released by and Mozilla developers. Learn to this software. - &helpus.start;&helpus.middle;&helpus.end; + Want to help? Please consider or get involved with our of the Unified XUL Platform. @@ -141,7 +135,7 @@ - + &trademarkInfo.part1; -- cgit v1.2.3 From bc0273b478b2185ec51adc4a27db2e1b014a6dab Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 21 Oct 2017 16:39:52 +0200 Subject: Strip HHMM from the about dialog displayed version. --- browser/base/content/aboutDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser/base/content') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 04384d584..f9571621f 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -50,7 +50,7 @@ function init(aEvent) let hour = buildID.slice(8, 10); let minute = buildID.slice(10, 12); if (Services.prefs.getBoolPref("general.useragent.appVersionIsBuildID")) { - versionField.textContent = `${year}.${month}.${day}.${hour}${minute}`; + versionField.textContent = `${year}.${month}.${day}`; } else { versionField.textContent = `v` + version + ` (${year}-${month}-${day})`; } -- cgit v1.2.3 From ee221138d4bbb5e6209d648a1a14cc176100963a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 22 Feb 2018 00:04:26 +0100 Subject: Restore the dynamic release notes URL from pref --- browser/base/content/aboutDialog.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser/base/content') diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index b77896b95..f64e79681 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -47,7 +47,7 @@ #expand #ifndef NIGHTLY_BUILD -#expand + #endif -- cgit v1.2.3