Bug 1255382 - Detangle passwordmgr.properties in android. r=Pike
authorZibi Braniecki <zbraniecki@mozilla.com>
Sun, 27 Aug 2017 17:50:02 -0700
changeset 377569 8c39c4756749e933d13e2feba33ef7934fb4e782
parent 377568 fb438fe5524d1d8198ef6ad1901466cde207a0df
child 377570 f89f3519cc7e757413a2a2b7414557eb1cf1ef4b
push id49936
push userzbraniecki@mozilla.com
push dateTue, 29 Aug 2017 19:04:09 +0000
treeherderautoland@8c39c4756749 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike
bugs1255382
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1255382 - Detangle passwordmgr.properties in android. r=Pike MozReview-Commit-ID: Cr7DTJpeXpB
mobile/android/components/LoginManagerPrompter.js
mobile/android/components/PromptService.js
mobile/android/locales/en-US/chrome/passwordmgr.properties
mobile/android/locales/filter.py
mobile/android/locales/jar.mn
mobile/android/locales/l10n.toml
mobile/locales/en-US/overrides/passwordmgr.properties
mobile/locales/filter.py
mobile/locales/jar.mn
--- a/mobile/android/components/LoginManagerPrompter.js
+++ b/mobile/android/components/LoginManagerPrompter.js
@@ -57,17 +57,17 @@ LoginManagerPrompter.prototype = {
   },
 
   __strBundle: null, // String bundle for L10N
   get _strBundle() {
     if (!this.__strBundle) {
       let bunService = Cc["@mozilla.org/intl/stringbundle;1"].
                        getService(Ci.nsIStringBundleService);
       this.__strBundle = {
-        pwmgr: bunService.createBundle("chrome://passwordmgr/locale/passwordmgr.properties"),
+        pwmgr: bunService.createBundle("chrome://browser/locale/passwordmgr.properties"),
         brand: bunService.createBundle("chrome://branding/locale/brand.properties")
       };
 
       if (!this.__strBundle)
         throw "String bundle for Login Manager not present!";
     }
 
     return this.__strBundle;
--- a/mobile/android/components/PromptService.js
+++ b/mobile/android/components/PromptService.js
@@ -843,17 +843,17 @@ var PromptUtils = {
                            .getInterface(Ci.nsIDOMWindowUtils);
       winUtils.dispatchEventToChromeOnly(aDomWin, event);
     } catch (ex) {
     }
   }
 };
 
 XPCOMUtils.defineLazyGetter(PromptUtils, "passwdBundle", function() {
-  return Services.strings.createBundle("chrome://passwordmgr/locale/passwordmgr.properties");
+  return Services.strings.createBundle("chrome://browser/locale/passwordmgr.properties");
 });
 
 XPCOMUtils.defineLazyGetter(PromptUtils, "bundle", function() {
   return Services.strings.createBundle("chrome://global/locale/commonDialogs.properties");
 });
 
 
 // Factory for wrapping nsIAuthPrompt interfaces to make them usable via an nsIAuthPrompt2 interface.
rename from mobile/locales/en-US/overrides/passwordmgr.properties
rename to mobile/android/locales/en-US/chrome/passwordmgr.properties
--- a/mobile/locales/en-US/overrides/passwordmgr.properties
+++ b/mobile/android/locales/en-US/chrome/passwordmgr.properties
@@ -8,15 +8,15 @@ rememberButton=Remember
 neverButton=Never
 
 # String is the login's hostname
 updatePassword=Update saved password for %S?
 updatePasswordNoUser=Update saved password for this login?
 updateButton=Update
 dontUpdateButton=Don't update
 
+# Copy of the toolkit's passwordmgr.properties
 userSelectText2=Select which login to update:
 passwordChangeTitle=Confirm Password Change
 
 # Strings used by PromptService.js
-rememberPassword=Use Password Manager to remember this password.
 username=Username
 password=Password
--- a/mobile/android/locales/filter.py
+++ b/mobile/android/locales/filter.py
@@ -20,17 +20,16 @@ def test(mod, path, entity = None):
         "chrome/global/about.dtd",
         "chrome/global/aboutAbout.dtd",
         "chrome/global/aboutReader.properties",
         "chrome/global/aboutRights.dtd",
         "chrome/global/charsetMenu.properties",
         "chrome/global/commonDialogs.properties",
         "chrome/global/intl.properties",
         "chrome/global/intl.css",
-        "chrome/passwordmgr/passwordmgr.properties",
         "chrome/search/search.properties",
         "chrome/pluginproblem/pluginproblem.dtd",
         "chrome/global/aboutSupport.dtd",
         "chrome/global/aboutSupport.properties",
         "crashreporter/crashes.dtd",
         "crashreporter/crashes.properties",
         "chrome/global/mozilla.dtd",
         "chrome/global/aboutTelemetry.dtd",
--- a/mobile/android/locales/jar.mn
+++ b/mobile/android/locales/jar.mn
@@ -26,33 +26,33 @@
   locale/@AB_CD@/browser/checkbox.dtd             (%chrome/checkbox.dtd)
   locale/@AB_CD@/browser/devicePrompt.properties  (%chrome/devicePrompt.properties)
   locale/@AB_CD@/browser/pippki.properties        (%chrome/pippki.properties)
   locale/@AB_CD@/browser/sync.properties          (%chrome/sync.properties)
   locale/@AB_CD@/browser/phishing.dtd             (%chrome/phishing.dtd)
   locale/@AB_CD@/browser/handling.properties      (%chrome/handling.properties)
   locale/@AB_CD@/browser/aboutLogins.dtd          (%chrome/aboutLogins.dtd)
   locale/@AB_CD@/browser/aboutLogins.properties  (%chrome/aboutLogins.properties)
+  locale/@AB_CD@/browser/passwordmgr.properties   (%chrome/passwordmgr.properties)
 #ifndef RELEASE_OR_BETA
   locale/@AB_CD@/browser/webcompatReporter.properties (%chrome/webcompatReporter.properties)
 #endif
 % resource search-plugins chrome://browser/locale/searchplugins/
 
 # overrides for toolkit l10n, also for en-US
 # keep this file list in sync with l10n.toml and filter.py
 relativesrcdir toolkit/locales:
   locale/@AB_CD@/browser/overrides/about.dtd                       (%chrome/global/about.dtd)
   locale/@AB_CD@/browser/overrides/aboutAbout.dtd                  (%chrome/global/aboutAbout.dtd)
   locale/@AB_CD@/browser/overrides/aboutReader.properties          (%chrome/global/aboutReader.properties)
   locale/@AB_CD@/browser/overrides/aboutRights.dtd                 (%chrome/global/aboutRights.dtd)
   locale/@AB_CD@/browser/overrides/charsetMenu.properties          (%chrome/global/charsetMenu.properties)
   locale/@AB_CD@/browser/overrides/commonDialogs.properties        (%chrome/global/commonDialogs.properties)
   locale/@AB_CD@/browser/overrides/intl.properties                 (%chrome/global/intl.properties)
   locale/@AB_CD@/browser/overrides/intl.css                        (%chrome/global/intl.css)
-  locale/@AB_CD@/browser/overrides/passwordmgr.properties          (%chrome/passwordmgr/passwordmgr.properties)
   locale/@AB_CD@/browser/overrides/search/search.properties        (%chrome/search/search.properties)
 # plugins
   locale/@AB_CD@/browser/overrides/plugins/pluginproblem.dtd       (%chrome/pluginproblem/pluginproblem.dtd)
 # about:support
   locale/@AB_CD@/browser/overrides/global/aboutSupport.dtd         (%chrome/global/aboutSupport.dtd)
   locale/@AB_CD@/browser/overrides/global/aboutSupport.properties  (%chrome/global/aboutSupport.properties)
 #about:crashes
   locale/@AB_CD@/browser/overrides/crashreporter/crashes.dtd         (%crashreporter/crashes.dtd)
@@ -69,17 +69,16 @@ relativesrcdir toolkit/locales:
 % override chrome://global/locale/aboutAbout.dtd chrome://browser/locale/overrides/aboutAbout.dtd
 % override chrome://global/locale/aboutReader.properties chrome://browser/locale/overrides/aboutReader.properties
 % override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd
 % override chrome://global/locale/charsetMenu.properties chrome://browser/locale/overrides/charsetMenu.properties
 % override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.properties
 % override chrome://mozapps/locale/handling/handling.properties chrome://browser/locale/handling.properties
 % override chrome://global/locale/intl.properties chrome://browser/locale/overrides/intl.properties
 % override chrome://global/locale/intl.css chrome://browser/locale/overrides/intl.css
-% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/overrides/passwordmgr/passwordmgr.properties
 % override chrome://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties
 % override chrome://pluginproblem/locale/pluginproblem.dtd chrome://browser/locale/overrides/plugins/pluginproblem.dtd
 % override chrome://global/locale/aboutSupport.dtd chrome://browser/locale/overrides/global/aboutSupport.dtd
 % override chrome://global/locale/aboutSupport.properties chrome://browser/locale/overrides/global/aboutSupport.properties
 % override chrome://global/locale/crashes.dtd chrome://browser/locale/overrides/crashreporter/crashes.dtd
 % override chrome://global/locale/crashes.properties chrome://browser/locale/overrides/crashreporter/crashes.properties
 % override chrome://global/locale/mozilla.dtd chrome://browser/locale/overrides/global/mozilla.dtd
 % override chrome://global/locale/aboutTelemetry.dtd chrome://browser/locale/overrides/global/aboutTelemetry.dtd
--- a/mobile/android/locales/l10n.toml
+++ b/mobile/android/locales/l10n.toml
@@ -172,20 +172,16 @@ exclude-multi-locale = [
     reference = "toolkit/locales/en-US/chrome/global/intl.properties"
     l10n = "{l}toolkit/chrome/global/intl.properties"
 
 [[paths]]
     reference = "toolkit/locales/en-US/chrome/global/intl.css"
     l10n = "{l}toolkit/chrome/global/intl.css"
 
 [[paths]]
-    reference = "toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties"
-    l10n = "{l}toolkit/chrome/passwordmgr/passwordmgr.properties"
-
-[[paths]]
     reference = "toolkit/locales/en-US/chrome/search/search.properties"
     l10n = "{l}toolkit/chrome/search/search.properties"
 
 [[paths]]
     reference = "toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd"
     l10n = "{l}toolkit/chrome/pluginproblem/pluginproblem.dtd"
 
 [[paths]]
--- a/mobile/locales/filter.py
+++ b/mobile/locales/filter.py
@@ -20,17 +20,16 @@ def test(mod, path, entity = None):
         "chrome/global/about.dtd",
         "chrome/global/aboutAbout.dtd",
         "chrome/global/aboutReader.properties",
         "chrome/global/aboutRights.dtd",
         "chrome/global/charsetMenu.properties",
         "chrome/global/commonDialogs.properties",
         "chrome/global/intl.properties",
         "chrome/global/intl.css",
-        "chrome/passwordmgr/passwordmgr.properties",
         "chrome/search/search.properties",
         "chrome/pluginproblem/pluginproblem.dtd",
         "chrome/global/aboutSupport.dtd",
         "chrome/global/aboutSupport.properties",
         "crashreporter/crashes.dtd",
         "crashreporter/crashes.properties",
         "chrome/global/mozilla.dtd",
         "chrome/global/aboutTelemetry.dtd",
--- a/mobile/locales/jar.mn
+++ b/mobile/locales/jar.mn
@@ -8,10 +8,8 @@
 % locale browser @AB_CD@ %locale/@AB_CD@/browser/
   locale/@AB_CD@/browser/region.properties        (%chrome/region.properties)
 
 # Fennec-specific overrides of generic strings
   locale/@AB_CD@/browser/netError.dtd             (%overrides/netError.dtd)
 % override chrome://global/locale/netError.dtd    chrome://browser/locale/netError.dtd
   locale/@AB_CD@/browser/appstrings.properties    (%overrides/appstrings.properties)
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
-  locale/@AB_CD@/browser/passwordmgr.properties    (%overrides/passwordmgr.properties)
-% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/passwordmgr.properties