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

Commits: 2de21152 by Pier Angelo Vendrame at 2023-02-15T09:24:19+01:00 fixup! Bug 40925: Implemented the Security Level component

Bug 40781 (build): Move l10n files to browser/locales

- - - - - 9c96c84b by Pier Angelo Vendrame at 2023-02-15T09:25:44+01:00 fixup! Bug 40926: Implemented the New Identity feature

Bug 40781 (build): Move l10n files to browser/locales

- - - - -

8 changed files:

- browser/components/newidentity/content/newidentity.js - browser/components/newidentity/jar.mn - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/jar.mn - browser/installer/package-manifest.in - browser/components/newidentity/locale/en-US/newIdentity.properties → browser/locales/en-US/chrome/browser/newIdentity.properties - browser/components/securitylevel/locale/en-US/securityLevel.properties → browser/locales/en-US/chrome/browser/securityLevel.properties - browser/locales/jar.mn

Changes:

===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { let bundle = null; try { bundle = Services.strings.createBundle( - "chrome://newidentity/locale/newIdentity.properties" + "chrome://browser/locale/newIdentity.properties" ); } catch (e) { console.warn("Could not load the New Identity strings");

===================================== browser/components/newidentity/jar.mn ===================================== @@ -3,14 +3,3 @@ browser.jar: content/browser/newIdentityDialog.xhtml (content/newIdentityDialog.xhtml) content/browser/newIdentityDialog.css (content/newIdentityDialog.css) content/browser/newIdentityDialog.js (content/newIdentityDialog.js) - -newidentity.jar: -# We need to list at least one locale here, to make Firefox load the localized -# copy of properties at chrome://newidentity/locale/newIdentity.properties. -# Ideally, we should use @AB_CD@.jar to automatically copy all the locales -# Firefox is built with. But we only provide English here, and injecting the -# translated files directly to the omni.ja works better for us, for the time -# being. In addition to inject the properties files, we also add the -# corresponding locale line to chrome/chrome.manifest. -% locale newidentity en-US %locale/en-US/ - locale/en-US/newIdentity.properties (locale/en-US/newIdentity.properties)

===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -46,7 +46,7 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", () => { let bundle = null; try { bundle = Services.strings.createBundle( - "chrome://securitylevel/locale/securityLevel.properties" + "chrome://browser/locale/securityLevel.properties" ); } catch (e) { console.warn("Could not load the Security Level strings");

===================================== browser/components/securitylevel/jar.mn ===================================== @@ -4,8 +4,3 @@ browser.jar: content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) content/browser/securitylevel/securityLevelIcon.svg (content/securityLevelIcon.svg) - -securitylevel.jar: -# See New Identity for further information on how this works -% locale securitylevel en-US %locale/en-US/ - locale/en-US/securityLevel.properties (locale/en-US/securityLevel.properties)

===================================== browser/installer/package-manifest.in ===================================== @@ -245,10 +245,6 @@ #endif

; Base Browser -@RESPATH@/browser/chrome/newidentity.manifest -@RESPATH@/browser/chrome/newidentity/ -@RESPATH@/browser/chrome/securitylevel.manifest -@RESPATH@/browser/chrome/securitylevel/ @RESPATH@/components/SecurityLevel.manifest

; [DevTools Startup Files]

===================================== browser/components/newidentity/locale/en-US/newIdentity.properties → browser/locales/en-US/chrome/browser/newIdentity.properties =====================================

===================================== browser/components/securitylevel/locale/en-US/securityLevel.properties → browser/locales/en-US/chrome/browser/securityLevel.properties =====================================

===================================== browser/locales/jar.mn ===================================== @@ -39,6 +39,8 @@ locale/browser/safebrowsing/safebrowsing.properties (%chrome/browser/safebrowsing/safebrowsing.properties) locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) + locale/browser/securityLevel.properties (%chrome/browser/securityLevel.properties) + locale/browser/newIdentity.properties (%chrome/browser/newIdentity.properties) % locale browser-region @AB_CD@ %locale/browser-region/ # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd)

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