Pier Angelo Vendrame pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits: 36d58583 by Pier Angelo Vendrame at 2023-08-30T11:56:14+02:00 fixup! Base Browser strings

Bug 41528: Added the version string for the about dialog

- - - - - 22073ee8 by Pier Angelo Vendrame at 2023-08-30T11:56:20+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Bug 41528: Localized the version string in the about dialog

- - - - -

3 changed files:

- browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - browser/locales/en-US/browser/base-browser.ftl

Changes:

===================================== browser/base/content/aboutDialog.js ===================================== @@ -43,19 +43,12 @@ function init() { }

// Include the build ID and display warning if this is an "a#" (nightly or aurora) build - let versionId = "aboutDialog-version"; + let versionId = "basebrowser-about-dialog-version"; let versionAttributes = { - version: AppConstants.MOZ_APP_VERSION_DISPLAY, - bits: Services.appinfo.is64Bit ? 64 : 32, + version: AppConstants.BASE_BROWSER_VERSION, + firefoxVersion: AppConstants.MOZ_APP_VERSION_DISPLAY, };

- // Adjust version text to show the fork version - versionAttributes.version = - AppConstants.BASE_BROWSER_VERSION + - " (based on Mozilla Firefox " + - AppConstants.MOZ_APP_VERSION_DISPLAY + - ")"; - let version = Services.appinfo.version; if (/a\d+$/.test(version)) { document.getElementById("experimental").hidden = false;

===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -30,6 +30,7 @@ <linkset> <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> + <html:link rel="localization" href="browser/base-browser.ftl"/> </linkset>

<html:div id="aboutDialogContainer">

===================================== browser/locales/en-US/browser/base-browser.ftl ===================================== @@ -23,3 +23,10 @@ basebrowser-rfp-restore-window-size-button-ak = R

basebrowser-addon-badge-recommended = Mozilla only recommends extensions that meet their standards for security and performance basebrowser-addon-badge-verified = Mozilla has reviewed this extension to meet their standards for security and performance + +## About dialog + +# "Mozilla Firefox" should be treated like a brand and it should be neither translated nor transliterated. +# $version (String) - The current browser version. E.g. "12.5.3". +# $firefoxVersion (String) - The version number of Firefox the current browser is based on. E.g. "102.15.0esr". +basebrowser-about-dialog-version = { $version } (based on Mozilla Firefox { $firefoxVersion })

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bcbb28e...