[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 3 commits: fixup! Bug 40925: Implemented the Security Level component

[Pier Angelo Vendrame (@pierov)]

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


Commits:
085cb603 by Pier Angelo Vendrame at 2023-02-14T19:13:03+01:00
fixup! Bug 40925: Implemented the Security Level component

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

- - - - -
ecc9d685 by Pier Angelo Vendrame at 2023-02-14T19:13:11+01:00
fixup! Bug 40926: Implemented the New Identity feature

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

- - - - -
33b90e5e by Pier Angelo Vendrame at 2023-02-14T19:13:19+01:00
fixup! Bug 40209: Implement Basic Crypto Safety

Bug 41351: Move cryptosafety l10n files with other Firefox files

- - - - -


10 changed files:

- browser/actors/CryptoSafetyParent.jsm
- 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
- toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties → browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties
- 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/actors/CryptoSafetyParent.jsm
=====================================
@@ -14,14 +14,14 @@ const { XPCOMUtils } = ChromeUtils.import(
 
 XPCOMUtils.defineLazyGetter(this, "cryptoSafetyBundle", () => {
   return Services.strings.createBundle(
-    "chrome://torbutton/locale/cryptoSafetyPrompt.properties"
+    "chrome://browser/locale/cryptoSafetyPrompt.properties"
   );
 });
 
 // en-US fallback in case a locale is missing a string.
 XPCOMUtils.defineLazyGetter(this, "fallbackCryptoSafetyBundle", () => {
   return Services.strings.createBundle(
-    "resource://gre/chrome/torbutton/locale/en-US/cryptoSafetyPrompt.properties"
+    "resource:///chrome/en-US/locale/browser/cryptoSafetyPrompt.properties"
   );
 });
 


=====================================
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 at .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
=====================================
@@ -251,10 +251,6 @@
 @RESPATH@/browser/features/*
 
 ; Base Browser
- at RESPATH@/browser/chrome/newidentity.manifest
- at RESPATH@/browser/chrome/newidentity/
- at RESPATH@/browser/chrome/securitylevel.manifest
- at RESPATH@/browser/chrome/securitylevel/
 @RESPATH@/components/SecurityLevel.manifest
 
 ; [DevTools Startup Files]


=====================================
toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties → browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties
=====================================


=====================================
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
=====================================
@@ -42,6 +42,9 @@
     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/cryptoSafetyPrompt.properties    (%chrome/browser/cryptoSafetyPrompt.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/1dace7f645a440e44cabf48aa1724750b12b706a...33b90e5e1ea36001dc33f97c91bfaba99ca982b1

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1dace7f645a440e44cabf48aa1724750b12b706a...33b90e5e1ea36001dc33f97c91bfaba99ca982b1
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230215/9af71ce5/attachment-0001.htm>