From e00cda2b95a46af1054b633090cc915ea5f81746 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 9 Jun 2021 13:37:12 +0000
Subject: [PATCH] Bug 1682022 - Convert to Fluent and / or fork the remainder
 of the AppMenu strings for sentence casing. r=flod,fluent-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D117067
---
 .../base/content/appmenu-viewcache.inc.xhtml  | 22 ++++----
 browser/locales/en-US/browser/appmenu.ftl     | 11 ++++
 browser/locales/en-US/browser/browser.ftl     |  2 +-
 .../locales/en-US/chrome/browser/browser.dtd  |  6 ---
 ...ug_1682022_forking_misc_appmenu_strings.py | 50 +++++++++++++++++++
 5 files changed, 73 insertions(+), 18 deletions(-)
 create mode 100644 python/l10n/fluent_migrations/bug_1682022_forking_misc_appmenu_strings.py

diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
index eb20f9c333d4..36917bf2cade 100644
--- a/browser/base/content/appmenu-viewcache.inc.xhtml
+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -39,12 +39,12 @@
       <toolbarseparator id="appMenu-tp-separator"/>
       <toolbarbutton id="appMenu-new-window-button"
                      class="subviewbutton subviewbutton-iconic"
-                     label="&newNavigatorCmd.label;"
+                     data-l10n-id="appmenuitem-new-window"
                      key="key_newNavigator"
                      command="cmd_newNavigator"/>
       <toolbarbutton id="appMenu-private-window-button"
                      class="subviewbutton subviewbutton-iconic"
-                     label="&newPrivateWindow.label;"
+                     data-l10n-id="appmenuitem-new-private-window"
                      key="key_privatebrowsing"
                      command="Tools:PrivateBrowsing"/>
 #ifdef NIGHTLY_BUILD
@@ -60,7 +60,7 @@
                      command="Tools:NonFissionWindow"/>
 #endif
       <toolbarbutton id="appMenuRestoreLastSession"
-                     label="&appMenuHistory.restoreSession.label;"
+                     data-l10n-id="appmenu-restore-session"
                      class="subviewbutton subviewbutton-iconic"
                      command="Browser:RestoreLastSession"/>
       <toolbarseparator/>
@@ -87,7 +87,7 @@
         <toolbarseparator orient="vertical"/>
         <toolbarbutton id="appMenu-fullscreen-button"
                        class="subviewbutton subviewbutton-iconic"
-                       label="&fullScreenCmd.label;"
+                       data-l10n-id="appmenuitem-fullscreen"
                        observes="View:FullScreen"
                        type="checkbox"
                        closemenu="auto"
@@ -243,7 +243,7 @@
       <toolbarseparator id="appMenu-fxa-separator" class="proton-zap"/>
       <toolbarbutton id="appMenu-new-tab-button2"
                      class="subviewbutton"
-                     label="&tabCmd.label;"
+                     data-l10n-id="appmenuitem-new-tab"
                      key="key_newNavigatorTab"
                      command="cmd_newNavigatorTab"/>
       <toolbarbutton id="appMenu-new-window-button2"
@@ -322,7 +322,7 @@
                        tooltip="dynamic-shortcut-tooltip"/>
         <toolbarbutton id="appMenu-fullscreen-button2"
                        class="subviewbutton subviewbutton-iconic"
-                       label="&fullScreenCmd.label;"
+                       data-l10n-id="appmenuitem-fullscreen"
                        observes="View:FullScreen"
                        type="checkbox"
                        closemenu="auto"
@@ -361,26 +361,26 @@
   <panelview id="PanelUI-history" flex="1">
     <vbox class="panel-subview-body">
       <toolbarbutton id="appMenuRecentlyClosedTabs"
-                     label="&historyUndoMenu.label;"
+                     data-l10n-id="appmenu-recently-closed-tabs"
                      class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                      closemenu="none"
                      oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedTabs', this)"/>
       <toolbarbutton id="appMenuRecentlyClosedWindows"
-                     label="&historyUndoWindowMenu.label;"
+                     data-l10n-id="appmenu-recently-closed-windows"
                      class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                      closemenu="none"
                      oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedWindows', this)"/>
       <toolbarbutton id="appMenuRestoreSession"
-                     label="&appMenuHistory.restoreSession.label;"
+                     data-l10n-id="appmenu-restore-session"
                      class="subviewbutton subviewbutton-iconic"
                      command="Browser:RestoreLastSession"/>
       <toolbarseparator/>
       <toolbarbutton id="appMenuClearRecentHistory"
-                     label="&appMenuHistory.clearRecent.label;"
+                     data-l10n-id="appmenu-clear-history"
                      class="subviewbutton subviewbutton-iconic"
                      command="Tools:Sanitize"/>
       <toolbarseparator/>
-      <html:h2 id="panelMenu_recentHistory" class="subview-subheader">&appMenuHistory.recentHistory.label;</html:h2>
+      <html:h2 id="panelMenu_recentHistory" class="subview-subheader" data-l10n-id="appmenu-recent-history-subheader"></html:h2>
       <toolbaritem id="appMenu_historyMenu"
                    orient="vertical"
                    smoothscroll="false"
diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl
index 86879a2a9c2d..232d6a727597 100644
--- a/browser/locales/en-US/browser/appmenu.ftl
+++ b/browser/locales/en-US/browser/appmenu.ftl
@@ -12,6 +12,8 @@ appmenuitem-update-banner3 =
     .label-update-restart = Update available — restart now
 
 appmenuitem-protection-dashboard-title = Protections Dashboard
+appmenuitem-new-tab =
+    .label = New Tab
 appmenuitem-new-window =
     .label = New Window
 appmenuitem-new-private-window =
@@ -147,6 +149,15 @@ appmenu-manage-history =
     .label = Manage History
 appmenu-reopen-all-tabs = Reopen All Tabs
 appmenu-reopen-all-windows = Reopen All Windows
+appmenu-restore-session =
+    .label = Restore Previous Session
+appmenu-clear-history =
+    .label = Clear Recent History…
+appmenu-recent-history-subheader = Recent History
+appmenu-recently-closed-tabs =
+    .label = Recently Closed Tabs
+appmenu-recently-closed-windows =
+    .label = Recently Closed Windows
 
 ## Help panel
 
diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
index 5a948069d01a..1f70547fa648 100644
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -565,7 +565,7 @@ crashed-subframe-submit =
 ## Bookmarks panels, menus and toolbar
 
 bookmarks-manage-bookmarks =
-  .label = Manage Bookmarks
+  .label = Manage bookmarks
 bookmarks-recent-bookmarks-panel-subheader = Recent Bookmarks
 bookmarks-toolbar-chevron =
   .tooltiptext = Show more bookmarks
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 4ebcde08c01f..e24b085ccf4a 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -65,13 +65,7 @@ this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY overflowCustomizeToolbar.accesskey   "C">
 
 <!ENTITY historyMenu.label "History">
-<!ENTITY historyUndoMenu.label "Recently Closed Tabs">
-<!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
-<!ENTITY historyUndoWindowMenu.label "Recently Closed Windows">
 
-<!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
-<!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
-<!ENTITY appMenuHistory.recentHistory.label "Recent History">
 <!ENTITY appMenuHelp.label "Help">
 
 <!-- LOCALIZATION NOTE (appMenuRemoteTabs.notabs.label): This is shown beneath
diff --git a/python/l10n/fluent_migrations/bug_1682022_forking_misc_appmenu_strings.py b/python/l10n/fluent_migrations/bug_1682022_forking_misc_appmenu_strings.py
new file mode 100644
index 000000000000..0567343fb5e1
--- /dev/null
+++ b/python/l10n/fluent_migrations/bug_1682022_forking_misc_appmenu_strings.py
@@ -0,0 +1,50 @@
+# coding=utf8
+
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from __future__ import absolute_import
+from fluent.migrate.helpers import transforms_from
+from fluent.migrate import COPY
+
+
+def migrate(ctx):
+    """Bug 1682022 - Forking some misc AppMenu strings for sentence casing, part {index}."""
+    ctx.add_transforms(
+        "browser/browser/appmenu.ftl",
+        "browser/browser/appmenu.ftl",
+        transforms_from(
+            """
+appmenu-developer-tools-extensions =
+    .label = { COPY(from_path, "extensionsForDevelopersCmd.label") }
+""",
+            from_path="devtools/client/menus.properties",
+        ),
+    )
+
+    ctx.add_transforms(
+        "browser/browser/appmenu.ftl",
+        "browser/browser/appmenu.ftl",
+        transforms_from(
+            """
+appmenuitem-new-window =
+    .label = { COPY(from_path, "newNavigatorCmd.label") }
+appmenuitem-new-private-window =
+    .label = { COPY(from_path, "newPrivateWindow.label") }
+appmenu-restore-session =
+    .label = { COPY(from_path, "appMenuHistory.restoreSession.label") }
+appmenuitem-fullscreen =
+    .label = { COPY(from_path, "fullScreenCmd.label") }
+appmenuitem-new-tab =
+    .label = { COPY(from_path, "tabCmd.label") }
+appmenu-clear-history =
+    .label = { COPY(from_path, "appMenuHistory.clearRecent.label") }
+appmenu-recent-history-subheader = { COPY(from_path, "appMenuHistory.recentHistory.label") }
+appmenu-recently-closed-tabs =
+    .label = { COPY(from_path, "historyUndoMenu.label") }
+appmenu-recently-closed-windows =
+    .label = { COPY(from_path, "historyUndoWindowMenu.label") }
+""",
+            from_path="browser/chrome/browser/browser.dtd",
+        ),
+    )