Backed out changeset a32a1f5c2676 (bug 1609557) for causing bc failures.

CLOSED TREE

browser/base/content/browser.xhtml

@@ -82,7 +82,6 @@
   <link rel="localization" href="browser/appmenu.ftl"/>
   <link rel="localization" href="preview/interventions.ftl"/>
   <link rel="localization" href="browser/sidebarMenu.ftl"/>
-  <link rel="localization" href="browser/places.ftl"/>
 
   <title>&mainWindow.title;</title>
 

browser/components/places/content/places.xhtml

@@ -43,7 +43,6 @@
   <linkset>
     <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
     <html:link rel="localization" href="browser/browserSets.ftl"/>
-    <html:link rel="localization" href="browser/places.ftl"/>
     <html:link rel="localization" href="browser/downloads.ftl"/>
   </linkset>
 
@@ -178,13 +177,16 @@
           <menupopup id="organizeButtonPopup">
             <menuitem id="newbookmark"
                       command="placesCmd_new:bookmark"
-                      data-l10n-id="places-new-bookmark"/>
+                      label="&cmd.new_bookmark.label;"
+                      accesskey="&cmd.new_bookmark.accesskey;"/>
             <menuitem id="newfolder"
                       command="placesCmd_new:folder"
-                      data-l10n-id="places-new-folder"/>
+                      label="&cmd.new_folder.label;"
+                      accesskey="&cmd.new_folder.accesskey;"/>
             <menuitem id="newseparator"
                       command="placesCmd_new:separator"
-                      data-l10n-id="places-new-separator"/>
+                      label="&cmd.new_separator.label;"
+                      accesskey="&cmd.new_separator.accesskey;"/>
 
 #ifdef XP_MACOSX
             <menuseparator id="orgDeleteSeparator"/>

browser/components/places/content/placesContextMenu.inc.xhtml

@@ -12,55 +12,64 @@
            onpopuphiding="this._view.destroyContextMenu();">
   <menuitem id="placesContext_open"
             command="placesCmd_open"
-            data-l10n-id="places-open"
+            label="&cmd.open.label;"
+            accesskey="&cmd.open.accesskey;"
             default="true"
             selectiontype="single"
             selection="link"
             forcehideintabbrowser="true"/>
   <menuitem id="placesContext_open:newtab"
             command="placesCmd_open:tab"
-            data-l10n-id="places-open-tab"
+            label="&cmd.open_tab.label;"
+            accesskey="&cmd.open_tab.accesskey;"
             selectiontype="single"
             selection="link"/>
   <menuitem id="placesContext_openContainer:tabs"
             oncommand="var view = PlacesUIUtils.getViewForNode(document.popupNode);
                        view.controller.openSelectionInTabs(event);"
             onclick="checkForMiddleClick(this, event);"
-            data-l10n-id="places-open-all-in-tabs"
+            label="&cmd.open_all_in_tabs.label;"
+            accesskey="&cmd.open_all_in_tabs.accesskey;"
             selectiontype="single|none"
             selection="folder|host|query"/>
   <menuitem id="placesContext_openLinks:tabs"
             oncommand="var view = PlacesUIUtils.getViewForNode(document.popupNode);
                        view.controller.openSelectionInTabs(event);"
             onclick="checkForMiddleClick(this, event);"
-            data-l10n-id="places-open-all-in-tabs"
+            label="&cmd.open_all_in_tabs.label;"
+            accesskey="&cmd.open_all_in_tabs.accesskey;"
             selectiontype="multiple"
             selection="link"/>
   <menuitem id="placesContext_open:newwindow"
             command="placesCmd_open:window"
-            data-l10n-id="places-open-window"
+            label="&cmd.open_window.label;"
+            accesskey="&cmd.open_window.accesskey;"
             selectiontype="single"
             selection="link"/>
   <menuitem id="placesContext_open:newprivatewindow"
             command="placesCmd_open:privatewindow"
-            data-l10n-id="places-open-private-window"
+            label="&cmd.open_private_window.label;"
+            accesskey="&cmd.open_private_window.accesskey;"
             selectiontype="single"
             selection="link"
             hideifprivatebrowsing="true"/>
   <menuseparator id="placesContext_openSeparator"/>
   <menuitem id="placesContext_new:bookmark"
             command="placesCmd_new:bookmark"
-            data-l10n-id="places-new-bookmark"
+            label="&cmd.new_bookmark.label;"
+            accesskey="&cmd.new_bookmark.accesskey;"
             selectiontype="any"
             hideifnoinsertionpoint="true"/>
   <menuitem id="placesContext_new:folder"
             command="placesCmd_new:folder"
-            data-l10n-id="places-new-folder-contextmenu"
+            label="&cmd.new_folder.label;"
+            accesskey="&cmd.context_new_folder.accesskey;"
             selectiontype="any"
             hideifnoinsertionpoint="true"/>
   <menuitem id="placesContext_new:separator"
             command="placesCmd_new:separator"
-            data-l10n-id="places-new-separator"
+            label="&cmd.new_separator.label;"
+            accesskey="&cmd.new_separator.accesskey;"
             closemenu="single"
             selectiontype="any"
             hideifnoinsertionpoint="true"/>
@@ -99,7 +108,8 @@
             forcehideselection="bookmark"/>
   <menuitem id="placesContext_deleteHost"
             command="placesCmd_deleteDataHost"
-            data-l10n-id="places-delete-domain-data"
+            label="&cmd.deleteDomainData.label;"
+            accesskey="&cmd.deleteDomainData.accesskey;"
             closemenu="single"
             selection="link|host"
             selectiontype="single"
@@ -107,12 +117,14 @@
   <menuseparator id="placesContext_deleteSeparator"/>
   <menuitem id="placesContext_sortBy:name"
             command="placesCmd_sortBy:name"
-            data-l10n-id="places-sortby-name"
+            label="&cmd.sortby_name.label;"
+            accesskey="&cmd.context_sortby_name.accesskey;"
             closemenu="single"
             selection="folder"/>
   <menuseparator id="placesContext_sortSeparator"/>
   <menuitem id="placesContext_show:info"
             command="placesCmd_show:info"
-            data-l10n-id="places-properties"
+            label="&cmd.properties.label;"
+            accesskey="&cmd.properties.accesskey;"
             selection="bookmark|folder|query"/>
 </menupopup>

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

@@ -1,42 +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/.
-
-places-open =
-  .label = Open
-  .accesskey = O
-places-open-tab =
-  .label = Open in a New Tab
-  .accesskey = w
-places-open-all-in-tabs =
-  .label = Open All in Tabs
-  .accesskey = O
-places-open-window =
-  .label = Open in a New Window
-  .accesskey = N
-places-open-private-window =
-  .label = Open in a New Private Window
-  .accesskey = P
-
-places-new-bookmark =
-  .label = New Bookmark…
-  .accesskey = B
-places-new-folder-contextmenu =
-  .label = New Folder…
-  .accesskey = F
-places-new-folder =
-  .label = New Folder…
-  .accesskey = o
-places-new-separator =
-  .label = New Separator
-  .accesskey = S
-
-places-delete-domain-data =
-  .label = Forget About This Site
-  .accesskey = F
-places-sortby-name =
-  .label = Sort By Name
-  .accesskey = r
-places-properties =
-  .label = Properties
-  .accesskey = i

browser/locales/en-US/chrome/browser/places/places.dtd

@@ -41,6 +41,34 @@
 <!ENTITY cmd.restoreFromFile.label      "Choose File…">
 <!ENTITY cmd.restoreFromFile.accesskey  "C">
 
+<!ENTITY cmd.deleteDomainData.label     "Forget About This Site">
+<!ENTITY cmd.deleteDomainData.accesskey "F">
+
+<!ENTITY cmd.open.label                  "Open">
+<!ENTITY cmd.open.accesskey              "O">
+<!ENTITY cmd.open_window.label           "Open in a New Window">
+<!ENTITY cmd.open_window.accesskey       "N">
+<!ENTITY cmd.open_private_window.label     "Open in a New Private Window">
+<!ENTITY cmd.open_private_window.accesskey "P">
+<!ENTITY cmd.open_tab.label              "Open in a New Tab">
+<!ENTITY cmd.open_tab.accesskey          "w">
+<!ENTITY cmd.open_all_in_tabs.label      "Open All in Tabs">
+<!ENTITY cmd.open_all_in_tabs.accesskey  "O">
+
+<!ENTITY cmd.properties.label      "Properties">
+<!ENTITY cmd.properties.accesskey  "i">
+
+<!ENTITY cmd.sortby_name.label              "Sort By Name">
+<!ENTITY cmd.context_sortby_name.accesskey  "r">
+
+<!ENTITY cmd.new_bookmark.label            "New Bookmark…">
+<!ENTITY cmd.new_bookmark.accesskey        "B">
+<!ENTITY cmd.new_folder.label              "New Folder…">
+<!ENTITY cmd.new_folder.accesskey          "o">
+<!ENTITY cmd.context_new_folder.accesskey  "F">
+<!ENTITY cmd.new_separator.label           "New Separator">
+<!ENTITY cmd.new_separator.accesskey       "S">
+
 <!ENTITY col.name.label          "Name">
 <!ENTITY col.tags.label          "Tags">
 <!ENTITY col.url.label           "Location">

python/l10n/fluent_migrations/bug_1609557_places_context_menu.py

@@ -1,57 +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, TERM_REFERENCE, MESSAGE_REFERENCE
-from fluent.migrate import COPY_PATTERN, REPLACE, COPY
-
-
-def migrate(ctx):
-    """Bug 1609557 - Migrate placesContextMenu.inc.xhtml to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/places.ftl',
-        'browser/browser/places.ftl',
-        transforms_from(
-"""
-places-open =
-    .label = { COPY(from_path, "cmd.open.label") }
-    .accesskey = { COPY(from_path, "cmd.open.accesskey") }
-places-open-tab =
-    .label = { COPY(from_path, "cmd.open_tab.label") }
-    .accesskey = { COPY(from_path, "cmd.open_tab.accesskey") }
-places-open-all-in-tabs =
-    .label = { COPY(from_path, "cmd.open_all_in_tabs.label") }
-    .accesskey = { COPY(from_path, "cmd.open_all_in_tabs.accesskey") }
-places-open-window =
-    .label = { COPY(from_path, "cmd.open_window.label") }
-    .accesskey = { COPY(from_path, "cmd.open_window.accesskey") }
-places-open-private-window =
-    .label = { COPY(from_path, "cmd.open_private_window.label") }
-    .accesskey = { COPY(from_path, "cmd.open_private_window.accesskey") }
-places-new-bookmark =
-    .label = { COPY(from_path, "cmd.new_bookmark.label") }
-    .accesskey = { COPY(from_path, "cmd.new_bookmark.accesskey") }
-places-new-folder-contextmenu =
-    .label = { COPY(from_path, "cmd.new_folder.label") }
-    .accesskey = { COPY(from_path, "cmd.context_new_folder.accesskey") }
-places-new-folder =
-    .label = { COPY(from_path, "cmd.new_folder.label") }
-    .accesskey = { COPY(from_path, "cmd.new_folder.accesskey") }
-places-new-separator =
-    .label = { COPY(from_path, "cmd.new_separator.label") }
-    .accesskey = { COPY(from_path, "cmd.new_separator.accesskey") }
-places-delete-domain-data =
-    .label = { COPY(from_path, "cmd.deleteDomainData.label") }
-    .accesskey = { COPY(from_path, "cmd.deleteDomainData.accesskey") }
-places-sortby-name =
-    .label = { COPY(from_path, "cmd.sortby_name.label") }
-    .accesskey = { COPY(from_path, "cmd.context_sortby_name.accesskey") }
-places-properties =
-    .label = { COPY(from_path, "cmd.properties.label") }
-    .accesskey = { COPY(from_path, "cmd.properties.accesskey") }
-""", from_path="browser/chrome/browser/places/places.dtd")
-    )