Bug 1435915 - Remove preferences.properties. r=fluent-reviewers,Gijs,flod

Differential Revision: https://phabricator.services.mozilla.com/D45723

--HG--
extra : source : 33b58a35cd4e9c52f6b0969c8e28e249e2a92154

browser/components/preferences/in-content/main.inc.xul

@@ -12,8 +12,6 @@
 
 <script src="chrome://mozapps/content/preferences/fontbuilder.js"/>
 
-<stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences.properties"/>
-
 <html:template id="template-paneGeneral">
 <hbox id="generalCategory"
       class="subcategory"
@@ -401,11 +399,6 @@
   </hbox>
 </groupbox>
 
-#ifdef HAVE_SHELL_SERVICE
-  <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
-  <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
-#endif
-
 <hbox id="updatesCategory"
       class="subcategory"
       hidden="true"

browser/components/preferences/in-content/preferences.xul

@@ -63,10 +63,6 @@
   <script src="chrome://browser/content/preferences/in-content/findInPage.js"/>
   <script src="chrome://browser/content/preferences/in-content/subdialogs.js"/>
 
-  <stringbundle id="bundleBrand"
-                src="chrome://branding/locale/brand.properties"/>
-  <stringbundle id="bundlePreferences"
-                src="chrome://browser/locale/preferences/preferences.properties"/>
   <stringbundle id="pkiBundle"
                 src="chrome://pippki/locale/pippki.properties"/>
   <stringbundle id="browserBundle"

browser/components/preferences/in-content/privacy.inc.xul

@@ -5,7 +5,6 @@
 <!-- Privacy panel -->
 
 <script src="chrome://browser/content/preferences/in-content/privacy.js"/>
-<stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
 <stringbundle id="signonBundle" src="chrome://passwordmgr/locale/passwordmgr.properties"/>
 <html:template id="template-panePrivacy">
 <hbox id="browserPrivacyCategory"
@@ -500,6 +499,12 @@
               data-l10n-id="forms-master-pw-change"/>
     </hbox>
   </hbox>
+  <!--
+    Those two strings are meant to be invisible and will be used exclusively to provide
+    localization for an alert window.
+  -->
+  <label id="fips-title" hidden="true" data-l10n-id="forms-master-pw-fips-title"></label>
+  <label id="fips-desc" hidden="true" data-l10n-id="forms-master-pw-fips-desc"></label>
 </groupbox>
 
 <!-- The form autofill section is inserted in to this box

browser/components/preferences/in-content/privacy.js

@@ -1858,12 +1858,9 @@ var gPrivacyPane = {
       Ci.nsIPKCS11ModuleDB
     );
     if (secmodDB.isFIPSEnabled) {
-      var bundle = document.getElementById("bundlePreferences");
-      Services.prompt.alert(
-        window,
-        bundle.getString("pw_change_failed_title"),
-        bundle.getString("pw_change2empty_in_fips_mode")
-      );
+      let title = document.getElementById("fips-title").textContent;
+      let desc = document.getElementById("fips-desc").textContent;
+      Services.prompt.alert(window, title, desc);
       this._initMasterPasswordUI();
     } else {
       gSubDialog.open(

browser/components/preferences/permissions.xul

@@ -24,9 +24,6 @@
 
   <script src="chrome://browser/content/preferences/permissions.js"/>
 
-  <stringbundle id="bundlePreferences"
-                src="chrome://browser/locale/preferences/preferences.properties"/>
-
   <keyset>
     <key data-l10n-id="permissions-close-key" modifiers="accel" oncommand="window.close();"/>
   </keyset>

browser/locales/en-US/browser/preferences/preferences.ftl

@@ -840,6 +840,9 @@ forms-master-pw-change =
     .label = Change Master Password…
     .accesskey = M
 
+forms-master-pw-fips-title = You are currently in FIPS mode. FIPS requires a non-empty Master Password.
+forms-master-pw-fips-desc = Password Change Failed
+
 ## Privacy Section - History
 
 history-header = History

browser/locales/en-US/chrome/browser/preferences/preferences.properties

@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#### Master Password
-
-pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
-pw_change_failed_title=Password Change Failed

browser/locales/en-US/chrome/browser/shellservice.properties

@@ -2,9 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-optionsLabel=%S &Options
-safeModeLabel=%S &Safe Mode
-
 # LOCALIZATION NOTE (setDefaultBrowserMessage2, setDefaultBrowserConfirm.label):
 # %S will be replaced by brandShortName
 setDefaultBrowserMessage2          = Get the most out of %S by setting it as your default browser

browser/locales/jar.mn

@@ -44,7 +44,6 @@
     locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)
     locale/browser/migration/migration.dtd         (%chrome/browser/migration/migration.dtd)
     locale/browser/migration/migration.properties  (%chrome/browser/migration/migration.properties)
-    locale/browser/preferences/preferences.properties     (%chrome/browser/preferences/preferences.properties)
     locale/browser/syncBrand.dtd                (%chrome/browser/syncBrand.dtd)
     locale/browser/syncSetup.properties         (%chrome/browser/syncSetup.properties)
 % locale browser-region @AB_CD@ %locale/browser-region/

python/l10n/fluent_migrations/bug_1435915_preferences_fips.py

@@ -0,0 +1,23 @@
+# coding=utf8
+
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from __future__ import absolute_import
+import fluent.syntax.ast as FTL
+from fluent.migrate.helpers import transforms_from
+from fluent.migrate.helpers import VARIABLE_REFERENCE, TERM_REFERENCE
+from fluent.migrate import REPLACE, COPY
+
+
+def migrate(ctx):
+    """Bug 1435915 - Migrate Preferences Password FIPS dialog, part {index}."""
+
+    ctx.add_transforms(
+        "browser/browser/preferences/preferences.ftl",
+        "browser/browser/preferences/preferences.ftl",
+        transforms_from(
+            """
+forms-master-pw-fips-title = { COPY(from_path, "pw_change2empty_in_fips_mode") }
+forms-master-pw-fips-desc = { COPY(from_path, "pw_change_failed_title") }
+""", from_path="browser/chrome/browser/preferences/preferences.properties"))

testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py

@@ -35,7 +35,6 @@ class BrowserWindow(BaseWindow):
     properties = [
         'chrome://branding/locale/brand.properties',
         'chrome://browser/locale/browser.properties',
-        'chrome://browser/locale/preferences/preferences.properties',
         'chrome://global/locale/browser.properties',
     ]