Bug 1434427 - Replace string for preferences confirmRestartPrompt to use "cancel" instead of "revert". r=flod
authorGregory Wlodarek <gregorywlodarek@gmail.com>
Fri, 16 Feb 2018 13:34:18 -0500
changeset 405331 8f285b62e035
parent 405330 b634845f959c
child 405332 d04639eccb18
push id60202
push usersfoster@mozilla.com
push dateMon, 26 Feb 2018 19:51:21 +0000
treeherderautoland@8f285b62e035 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1434427
milestone60.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 1434427 - Replace string for preferences confirmRestartPrompt to use "cancel" instead of "revert". r=flod * Removed the revertNoRestartButton entry from the migration script as this no longer exists after this change MozReview-Commit-ID: AGJ2OfYVPok
browser/components/preferences/in-content/preferences.js
browser/locales/en-US/browser/preferences/preferences.ftl
python/l10n/fluent_migrations/bug_1424682_preferences_chrome.py
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -334,17 +334,17 @@ async function confirmRestartPrompt(aRes
                                     aWantRestartLaterButton) {
   let [
     msg, title, restartButtonText, noRestartButtonText, restartLaterButtonText
   ] = await document.l10n.formatValues([
     [aRestartToEnable ?
       "feature-enable-requires-restart" : "feature-disable-requires-restart"],
     ["should-restart-title"],
     ["should-restart-ok"],
-    ["revert-no-restart-button"],
+    ["cancel-no-restart-button"],
     ["restart-later"],
   ]);
 
   // Set up the first (index 0) button:
   let buttonFlags = (Services.prompt.BUTTON_POS_0 *
                      Services.prompt.BUTTON_TITLE_IS_STRING);
 
 
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -50,10 +50,10 @@ close-button =
     .aria-label = Close
 
 ## Browser Restart Dialog
 
 feature-enable-requires-restart = { -brand-short-name } must restart to enable this feature.
 feature-disable-requires-restart = { -brand-short-name } must restart to disable this feature.
 should-restart-title = Restart { -brand-short-name }
 should-restart-ok = Restart { -brand-short-name } now
-revert-no-restart-button = Revert
+cancel-no-restart-button = Cancel
 restart-later = Restart Later
--- a/python/l10n/fluent_migrations/bug_1424682_preferences_chrome.py
+++ b/python/l10n/fluent_migrations/bug_1424682_preferences_chrome.py
@@ -211,23 +211,16 @@ def migrate(ctx):
                     'browser/chrome/browser/preferences/preferences.properties',
                     'okToRestartButton',
                     {
                         '%S' : MESSAGE_REFERENCE('-brand-short-name')
                     }
                 )
             ),
             FTL.Message(
-                id=FTL.Identifier('revert-no-restart-button'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'revertNoRestartButton',
-                )
-            ),
-            FTL.Message(
                 id=FTL.Identifier('restart-later'),
                 value=COPY(
                     'browser/chrome/browser/preferences/preferences.properties',
                     'restartLater',
                 )
             ),
         ]
     )