Backed out changeset 63c10baf1578 (bug 1727916) for causing browser-chrome failures in en-US/appmenuitem.
authorSandor Molnar <smolnar@mozilla.com>
Fri, 03 Sep 2021 23:22:36 +0300
changeset 590998 14616096bc40dbbfe41f7dd366d167e6711e9c88
parent 590997 3fd3c2745def8d2197f11b76c07f330c1bcf18b2
child 590999 a7e25837682d02fc7b726613f16420a70ce86d5a
push id149187
push usersmolnar@mozilla.com
push dateFri, 03 Sep 2021 20:25:40 +0000
treeherderautoland@a7e25837682d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1727916
milestone93.0a1
backs out63c10baf1578248d6b51e5a701534bbb35072a26
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
Backed out changeset 63c10baf1578 (bug 1727916) for causing browser-chrome failures in en-US/appmenuitem.
browser/base/content/appmenu-viewcache.inc.xhtml
browser/base/content/navigator-toolbox.inc.xhtml
browser/components/customizableui/CustomizableWidgets.jsm
browser/locales/en-US/browser/appmenu.ftl
browser/locales/en-US/browser/browser.ftl
browser/locales/en-US/chrome/browser/browser.dtd
browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
python/l10n/fluent_migrations/bug_1727916_customizable_toolbar_widgets.py
--- a/browser/base/content/appmenu-viewcache.inc.xhtml
+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -50,17 +50,17 @@
                      command="cmd_newNavigatorTab"/>
       <toolbarbutton id="appMenu-new-window-button2"
                      class="subviewbutton"
                      data-l10n-id="appmenuitem-new-window"
                      key="key_newNavigator"
                      command="cmd_newNavigator"/>
       <toolbarbutton id="appMenu-new-private-window-button2"
                      class="subviewbutton"
-                     data-l10n-id="appmenuitem-new-private-window2"
+                     data-l10n-id="appmenuitem-new-private-window"
                      key="key_privatebrowsing"
                      command="Tools:PrivateBrowsing"/>
       <toolbarseparator/>
       <toolbarbutton id="appMenu-bookmarks-button"
                      class="subviewbutton subviewbutton-nav"
                      data-l10n-id="library-bookmarks-menu"
                      closemenu="none"
                      oncommand="BookmarkingUI.showSubView(this);"/>
@@ -420,25 +420,25 @@
                          align="center"
                          class="subviewbutton"
                          oncommand="gSync.doSync();"
                          onmouseover="gSync.refreshSyncButtonsTooltip();"
                          closemenu="none">
             <hbox flex="1">
               <image class="syncNowBtn"/>
               <label class="syncnow-label"
-                     data-l10n-id="appmenuitem-fxa-toolbar-sync-now2"
-                     sync-now-data-l10n-id="appmenuitem-fxa-toolbar-sync-now2"
+                     data-l10n-id="remote-tabs-sync-now"
+                     sync-now-data-l10n-id="remote-tabs-sync-now"
                      syncing-data-l10n-id="fxa-toolbar-sync-syncing2"
                      crop="end"/>
             </hbox>
           </toolbarbutton>
           <toolbarbutton id="PanelUI-remotetabs-view-managedevices"
                          class="subviewbutton"
-                         data-l10n-id="appmenuitem-fxa-manage-account"
+                         data-l10n-id="remote-tabs-manage-account"
                          oncommand="gSync.openDevicesManagementPage('syncedtabs-menupanel');">
                          <observes element="sidebar-box" attribute="positionend"/>
           </toolbarbutton>
           <toolbarseparator id="PanelUI-remotetabs-separator"/>
         </vbox>
         <deck id="PanelUI-remotetabs-deck">
           <!-- Sync is ready to Sync and the "tabs" engine is enabled -->
           <vbox id="PanelUI-remotetabs-tabspane">
--- a/browser/base/content/navigator-toolbox.inc.xhtml
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -558,27 +558,27 @@
                    print-button-title="&printButton.tooltip;"
 #endif
                    keepbroadcastattributeswhencustomizing="true"
                    tooltip="dynamic-shortcut-tooltip"
                    label="&printButton.label;"/>
 
 
     <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                   data-l10n-id="appmenuitem-new-window"
+                   label="&newNavigatorCmd.label;"
                    command="cmd_newNavigator"
                    tooltip="dynamic-shortcut-tooltip"
                    ondrop="newWindowButtonObserver.onDrop(event)"
                    ondragover="newWindowButtonObserver.onDragOver(event)"
                    ondragenter="newWindowButtonObserver.onDragOver(event)"/>
 
     <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                    observes="View:FullScreen"
                    type="checkbox"
-                   data-l10n-id="appmenuitem-fullscreen"
+                   label="&fullScreenCmd.label;"
                    tooltip="dynamic-shortcut-tooltip"/>
 
     <toolbarbutton id="bookmarks-menu-button"
                    class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
                    type="menu"
                    data-l10n-id="bookmarks-menu-button"
                    tooltip="dynamic-shortcut-tooltip"
                    ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -228,18 +228,18 @@ const CustomizableWidgets = [
       }
       panelview.appendChild(body);
       panelview.appendChild(separator);
       panelview.appendChild(footer);
     },
   },
   {
     id: "save-page-button",
-    l10nId: "toolbar-button-save-page",
     shortcutId: "key_savePage",
+    tooltiptext: "save-page-button.tooltiptext3",
     onCommand(aEvent) {
       let win = aEvent.target.ownerGlobal;
       win.saveBrowser(win.gBrowser.selectedBrowser);
     },
   },
   {
     id: "find-button",
     shortcutId: "key_find",
@@ -248,18 +248,18 @@ const CustomizableWidgets = [
       let win = aEvent.target.ownerGlobal;
       if (win.gLazyFindCommand) {
         win.gLazyFindCommand("onFindCommand");
       }
     },
   },
   {
     id: "open-file-button",
-    l10nId: "toolbar-button-open-file",
     shortcutId: "openFileKb",
+    tooltiptext: "open-file-button.tooltiptext3",
     onCommand(aEvent) {
       let win = aEvent.target.ownerGlobal;
       win.BrowserOpenFileWindow();
     },
   },
   {
     id: "sidebar-button",
     tooltiptext: "sidebar-button.tooltiptext2",
@@ -433,28 +433,29 @@ const CustomizableWidgets = [
     id: "characterencoding-button",
     l10nId: "repair-text-encoding-button",
     onCommand(aEvent) {
       aEvent.view.BrowserForceEncodingDetection();
     },
   },
   {
     id: "email-link-button",
-    l10nId: "toolbar-button-email-link",
+    tooltiptext: "email-link-button.tooltiptext3",
     onCommand(aEvent) {
       let win = aEvent.view;
       win.MailIntegration.sendLinkForBrowser(win.gBrowser.selectedBrowser);
     },
   },
 ];
 
 if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) {
   CustomizableWidgets.push({
     id: "sync-button",
-    l10nId: "toolbar-button-synced-tabs",
+    label: "remotetabs-panelmenu.label",
+    tooltiptext: "remotetabs-panelmenu.tooltiptext2",
     type: "view",
     viewId: "PanelUI-remotetabs",
     onViewShowing(aEvent) {
       let panelview = aEvent.target;
       let doc = panelview.ownerDocument;
 
       let syncNowBtn = panelview.querySelector(".syncnow-label");
       let l10nId = syncNowBtn.getAttribute(
@@ -600,16 +601,15 @@ if (Services.prefs.getBoolPref("privacy.
       forgetButton.removeEventListener("command", this);
     },
   });
 }
 
 if (PrivateBrowsingUtils.enabled) {
   CustomizableWidgets.push({
     id: "privatebrowsing-button",
-    l10nId: "appmenuitem-new-private-window2",
     shortcutId: "key_privatebrowsing",
     onCommand(e) {
       let win = e.target.ownerGlobal;
       win.OpenBrowserWindow({ private: true });
     },
   });
 }
--- a/browser/locales/en-US/browser/appmenu.ftl
+++ b/browser/locales/en-US/browser/appmenu.ftl
@@ -10,21 +10,18 @@ appmenuitem-update-banner3 =
     .label-update-manual = Update available — download now
     .label-update-unsupported = Unable to update — system incompatible
     .label-update-restart = Update available — restart now
 
 appmenuitem-new-tab =
     .label = New tab
 appmenuitem-new-window =
     .label = New window
-# Variables
-# $shortcut (string) - Keyboard shortcut to open a new private browsing window
-appmenuitem-new-private-window2 =
+appmenuitem-new-private-window =
     .label = New private window
-    .tooltiptext = Open a new private browsing window ({ $shortcut })
 appmenuitem-passwords =
     .label = Passwords
 appmenuitem-addons-and-themes =
     .label = Add-ons and themes
 appmenuitem-find-in-page =
     .label = Find in page…
 appmenuitem-more-tools =
     .label = More tools
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -680,36 +680,16 @@ toolbar-settings-button =
       [macos] Open settings ({ $shortcut })
      *[other] Open settings
   }
 
 toolbar-overflow-customize-button =
   .label = Customize toolbar…
   .accesskey = C
 
-toolbar-button-email-link =
-  .label = Email link
-  .tooltiptext = Email a link to this page
-
-# Variables:
-#  $shortcut (String): keyboard shortcut to save a copy of the page
-toolbar-button-save-page =
-  .label = Save page
-  .tooltiptext = Save this page ({ $shortcut })
-
-# Variables:
-#  $shortcut (String): keyboard shortcut to open a local file
-toolbar-button-open-file =
-  .label = Open file
-  .tooltiptext = Open a file ({ $shortcut })
-
-toolbar-button-synced-tabs =
-  .label = Synced tabs
-  .tooltiptext = Show tabs from other devices
-
 ## EME notification panel
 
 eme-notifications-drm-content-playing = Some audio or video on this site uses DRM software, which may limit what { -brand-short-name } can let you do with it.
 eme-notifications-drm-content-playing-manage = Manage settings
 eme-notifications-drm-content-playing-manage-accesskey = M
 eme-notifications-drm-content-playing-dismiss = Dismiss
 eme-notifications-drm-content-playing-dismiss-accesskey = D
 
@@ -720,16 +700,22 @@ panel-save-update-password = Password
 
 ## Add-on removal warning
 
 # Variables:
 #  $name (String): The name of the addon that will be removed.
 addon-removal-title = Remove { $name }?
 addon-removal-abuse-report-checkbox = Report this extension to { -vendor-short-name }
 
+## Remote / Synced tabs
+
+remote-tabs-manage-account =
+  .label = Manage Account
+remote-tabs-sync-now = Sync Now
+
 ##
 
 # "More" item in macOS share menu
 menu-share-more =
     .label = More…
 ui-tour-info-panel-close =
     .tooltiptext = Close
 
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -15,16 +15,17 @@
 <!ENTITY printCmd.label "Print…">
 
 <!ENTITY menubarCmd.label "Menu Bar">
 <!ENTITY menubarCmd.accesskey "M">
 <!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
 include the word "toolbar" or such, because screen readers already know that
 this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY navbar.accessibleLabel "Navigation">
+<!ENTITY fullScreenCmd.label "Full Screen">
 
 
 <!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
      for the Firefox Account toolbar menu screen. The `Signed in as` text is
      followed by the user's email. -->
 <!ENTITY fxa.menu.signin.label "Sign in to &brandProductName;">
 
 <!-- LOCALIZATION NOTE (fxa.service) Used to define the different FxA services
--- a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
@@ -1,20 +1,35 @@
 # 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/.
 
 history-panelmenu.label = History
 # LOCALIZATION NOTE(history-panelmenu.tooltiptext2): %S is the keyboard shortcut
 history-panelmenu.tooltiptext2 = Show your history (%S)
 
+remotetabs-panelmenu.label = Synced Tabs
+remotetabs-panelmenu.tooltiptext2 = Show tabs from other devices
+
+privatebrowsing-button.label = New Private Window
+# LOCALIZATION NOTE(privatebrowsing-button.tooltiptext): %S is the keyboard shortcut
+privatebrowsing-button.tooltiptext = Open a new Private Browsing window (%S)
+
+save-page-button.label = Save Page
+# LOCALIZATION NOTE(save-page-button.tooltiptext3): %S is the keyboard shortcut
+save-page-button.tooltiptext3 = Save this page (%S)
+
 find-button.label = Find
 # LOCALIZATION NOTE(find-button.tooltiptext3): %S is the keyboard shortcut.
 find-button.tooltiptext3 = Find in this page (%S)
 
+open-file-button.label = Open File
+# LOCALIZATION NOTE (open-file-button.tooltiptext3): %S is the keyboard shortcut.
+open-file-button.tooltiptext3 = Open a file (%S)
+
 developer-button.label = Developer
 # LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut
 developer-button.tooltiptext2 = Open Web developer tools (%S)
 
 profiler-button.label = Profiler
 profiler-button.tooltiptext = Record a performance profile
 
 sidebar-button.label = Sidebars
@@ -44,14 +59,17 @@ cut-button.tooltiptext2 = Cut (%S)
 copy-button.label = Copy
 # LOCALIZATION NOTE(copy-button.tooltiptext2): %S is the keyboard shortcut.
 copy-button.tooltiptext2 = Copy (%S)
 
 paste-button.label = Paste
 # LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
 paste-button.tooltiptext2 = Paste (%S)
 
+email-link-button.label = Email Link
+email-link-button.tooltiptext3 = Email a link to this page
+
 panic-button.label = Forget
 panic-button.tooltiptext = Forget about some browsing history
 
 toolbarspring.label = Flexible Space
 toolbarseparator.label = Separator
 toolbarspacer.label = Space
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1727916_customizable_toolbar_widgets.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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, VARIABLE_REFERENCE
-from fluent.migrate import COPY, COPY_PATTERN, REPLACE
-
-
-def migrate(ctx):
-    """Bug 1727916 - Switch several customizable toolbar item names to sentence case, part {index}"""
-
-    ctx.add_transforms(
-        "browser/browser/browser.ftl",
-        "browser/browser/browser.ftl",
-        transforms_from(
-            """
-toolbar-button-email-link =
-    .label = { COPY(from_path, "email-link-button.label") }
-    .tooltiptext = { COPY(from_path, "email-link-button.tooltiptext3") }
-toolbar-button-synced-tabs =
-    .label = { COPY(from_path, "remotetabs-panelmenu.label") }
-    .tooltiptext = { COPY(from_path, "remotetabs-panelmenu.tooltiptext2") }
-""",
-            from_path="browser/chrome/browser/customizableui/customizableWidgets.properties",
-        ),
-    )
-
-    ctx.add_transforms(
-        "browser/browser/browser.ftl",
-        "browser/browser/browser.ftl",
-        [
-            FTL.Message(
-                id=FTL.Identifier("toolbar-button-save-page"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "save-page-button.label",
-                        ),
-                    ),
-                    FTL.Attribute(
-                        id=FTL.Identifier("tooltiptext"),
-                        value=REPLACE(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "save-page-button.tooltiptext3",
-                            {"%1$S": VARIABLE_REFERENCE("shortcut")},
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier("toolbar-button-open-file"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "open-file-button.label",
-                        ),
-                    ),
-                    FTL.Attribute(
-                        id=FTL.Identifier("tooltiptext"),
-                        value=REPLACE(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "open-file-button.tooltiptext3",
-                            {"%1$S": VARIABLE_REFERENCE("shortcut")},
-                        ),
-                    ),
-                ],
-            ),
-        ],
-    )
-
-    ctx.add_transforms(
-        "browser/browser/appmenu.ftl",
-        "browser/browser/appmenu.ftl",
-        [
-            FTL.Message(
-                id=FTL.Identifier("appmenuitem-new-private-window2"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY_PATTERN(
-                            "browser/browser/appmenu.ftl",
-                            "appmenuitem-new-private-window.label",
-                        ),
-                    ),
-                    FTL.Attribute(
-                        id=FTL.Identifier("tooltiptext"),
-                        value=REPLACE(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "privatebrowsing-button.tooltiptext",
-                            {"%1$S": VARIABLE_REFERENCE("shortcut")},
-                        ),
-                    ),
-                ],
-            ),
-        ],
-    )