Bug 1609755 - Port bug 1605467 - Migrate text action keys to Fluent. r=darktrojan
authorRichard Marti <richard.marti@gmail.com>
Thu, 16 Jan 2020 20:45:23 +0100
changeset 37971 899c53e49dbd6ab97d0145f68c0fc9b94bfb4195
parent 37970 7b36fb7a8114242e4c2f5ecea0efbe571187d791
child 37972 8059037368711aca30213657c97b3ea62d2574c5
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersdarktrojan
bugs1609755, 1605467
Bug 1609755 - Port bug 1605467 - Migrate text action keys to Fluent. r=darktrojan
mail/base/content/mainKeySet.inc.xhtml
mail/components/activity/content/activity.xhtml
mail/components/addrbook/content/addressbook.xhtml
mail/components/compose/content/messengercompose.xhtml
mail/locales/en-US/chrome/communicator/utilityOverlay.dtd
mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
mail/locales/en-US/chrome/messenger/viewSource.dtd
--- a/mail/base/content/mainKeySet.inc.xhtml
+++ b/mail/base/content/mainKeySet.inc.xhtml
@@ -15,42 +15,42 @@
 #ifndef XP_MACOSX
   <key id="key_close2" keycode="VK_F4" modifiers="accel" command="cmd_close"/>
   <key id="key_renameFolder" keycode="&renameFolder.key;" oncommand="goDoCommand('cmd_renameFolder')"/>
 #endif
 #ifdef XP_UNIX
   <key id="key_quit" command="cmd_quit" modifiers="accel" key="&quitApplicationCmd.key;"/>
 #endif
   <!-- Edit Menu -->
-  <key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
+  <key id="key_undo" data-l10n-id="text-action-undo-shortcut" modifiers="accel"/>
   <key id="key_redo"
 #ifdef XP_UNIX
-       key="&undoCmd.key;" modifiers="shift, accel"/>
+       data-l10n-id="text-action-undo-shortcut" modifiers="shift, accel"/>
 #else
-       key="&redoCmd.key;" modifiers="accel"/>
+      data-l10n-id="text-action-redo-shortcut" modifiers="accel"/>
 #endif
-  <key id="key_cut" key="&cutCmd.key;" modifiers="accel"/>
-  <key id="key_copy" key="&copyCmd.key;" modifiers="accel"/>
-  <key id="key_paste" key="&pasteCmd.key;" modifiers="accel"/>
+  <key id="key_cut" data-l10n-id="text-action-cut-shortcut" modifiers="accel"/>
+  <key id="key_copy" data-l10n-id="text-action-copy-shortcut" modifiers="accel"/>
+  <key id="key_paste" data-l10n-id="text-action-paste-shortcut" modifiers="accel"/>
 #ifdef XP_MACOSX
   <key id="key_delete" keycode="VK_BACK"
        oncommand="goDoCommand('cmd_delete');"/>
   <key id="key_delete2" keycode="VK_DELETE"
        oncommand="goDoCommand('cmd_delete');"/>
   <key id="cmd_shiftDelete" keycode="VK_BACK"
        oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
   <key id="cmd_shiftDelete2" keycode="VK_DELETE"
        oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
 #else
   <key id="key_delete" keycode="VK_DELETE"
        oncommand="goDoCommand('cmd_delete');"/>
   <key id="cmd_shiftDelete" keycode="VK_DELETE"
        oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
 #endif
-  <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
+  <key id="key_selectAll" data-l10n-id="text-action-select-all-shortcut" modifiers="accel"/>
   <key id="key_selectThread" key="&selectThreadCmd.key;"             oncommand="goDoCommand('cmd_selectThread');" modifiers="accel, shift"/>
 
   <key id="key_toggleRead" key="&toggleReadCmd.key;"                 oncommand="goDoCommand('cmd_toggleRead');"/>
   <key id="key_toggleFlagged" key="&markStarredCmd.key;"             oncommand="goDoCommand('cmd_markAsFlagged');"/>
   <key id="key_markJunk" key="&markAsJunkCmd.key;"                   oncommand="goDoCommand('cmd_markAsJunk');"/>
   <key id="key_markNotJunk" key="&markAsNotJunkCmd.key;"             oncommand="goDoCommand('cmd_markAsNotJunk');"
        modifiers="shift"/>
 
--- a/mail/components/activity/content/activity.xhtml
+++ b/mail/components/activity/content/activity.xhtml
@@ -67,17 +67,19 @@
     <key id="key_close2" key="&cmd.close2Unix.commandkey;"
          oncommand="closeWindow(true);" modifiers="accel"/>
 #else
     <key id="key_close2" key="&cmd.close2.commandkey;"
          oncommand="closeWindow(true);" modifiers="accel"/>
 #endif
     <key keycode="VK_ESCAPE" oncommand="closeWindow(true);"/>
 
-    <key id="key_selectAllActivities" key="&selectAllCmd.key;" modifiers="accel"
+    <key id="key_selectAllActivities"
+         data-l10n-id="text-action-select-all-shortcut"
+         modifiers="accel"
          command="cmd_selectAllActivities"/>
   </keyset>
 
   <vbox id="contextMenuPalette" hidden="true">
     <menuitem id="menuitem_selectAll"
               data-l10n-id="text-action-select-all"
               command="cmd_selectAllActivities"/>
   </vbox>
--- a/mail/components/addrbook/content/addressbook.xhtml
+++ b/mail/components/addrbook/content/addressbook.xhtml
@@ -127,36 +127,36 @@
   <key id="key_newCard" key="&newContact.key;" modifiers="accel"
        command="cmd_newCard"/>
 
   <key id="key_printCard" key="&printContactCmd.key;" command="cmd_printcard"
        modifiers="accel"/>
   <key id="key_close" key="&closeCmd.key;" modifiers="accel" oncommand="AbClose()"/>
 
   <!-- Edit Menu -->
-  <key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
+  <key id="key_undo" data-l10n-id="text-action-undo-shortcut" modifiers="accel"/>
   <key id="key_redo"
 #ifdef XP_UNIX
-       key="&undoCmd.key;"
+       data-l10n-id="text-action-undo-shortcut"
        modifiers="accel,shift"/>
 #else
-       key="&redoCmd.key;"
+      data-l10n-id="text-action-redo-shortcut"
        modifiers="accel"/>
 #endif
-  <key id="key_cut" key="&cutCmd.key;" modifiers="accel"/>
-  <key id="key_copy" key="&copyCmd.key;" modifiers="accel"/>
-  <key id="key_paste" key="&pasteCmd.key;" modifiers="accel"/>
+  <key id="key_cut" data-l10n-id="text-action-cut-shortcut" modifiers="accel"/>
+  <key id="key_copy" data-l10n-id="text-action-copy-shortcut" modifiers="accel"/>
+  <key id="key_paste" data-l10n-id="text-action-paste-shortcut" modifiers="accel"/>
 
 #ifdef XP_MACOSX
   <key id="key_delete" keycode="VK_BACK" command="cmd_delete"/>
   <key id="key_delete2" keycode="VK_DELETE" command="cmd_delete"/>
 #else
   <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
 #endif
-  <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
+  <key id="key_selectAll" data-l10n-id="text-action-select-all-shortcut" modifiers="accel"/>
 #ifdef MOZ_WIDGET_GTK
   <key id="key_searchAddresses" key="&searchAddressesCmd.key;" oncommand="onAdvancedAbSearch();" modifiers="shift"/>
 #else
   <key id="key_searchAddresses" key="&searchAddressesCmd.key;" oncommand="onAdvancedAbSearch();" modifiers="accel, shift"/>
 #endif
   <key id="key_properties" command="cmd_properties" key="&propertiesCmd.key;" modifiers="accel"/>
 
   <!-- Tab/F6 Keys -->
--- a/mail/components/compose/content/messengercompose.xhtml
+++ b/mail/components/compose/content/messengercompose.xhtml
@@ -389,28 +389,28 @@
   <key id="key_close" key="&closeCmd.key;" command="cmd_close"  modifiers="accel"/>
   <key id="key_save" key="&saveCmd.key;" command="cmd_saveDefault" modifiers="accel"/>
   <key id="key_send" keycode="&sendCmd.keycode;" observes="cmd_sendWithCheck" modifiers="accel"/>
   <key id="key_sendLater" keycode="&sendLaterCmd.keycode;" observes="cmd_sendLater" modifiers="accel, shift"/>
   <key id="key_print" key="&printCmd.key;" command="cmd_print" modifiers="accel"/>
   <key id="printKb" key="&printCmd.key;" command="cmd_print" modifiers="accel"/>
 
   <!-- Edit Menu -->
-  <key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
+  <key id="key_undo" data-l10n-id="text-action-undo-shortcut" modifiers="accel"/>
   <key id="key_redo"
 #ifdef XP_UNIX
-       key="&undoCmd.key;"
+       data-l10n-id="text-action-undo-shortcut"
        modifiers="accel,shift"/>
 #else
-       key="&redoCmd.key;"
+      data-l10n-id="text-action-redo-shortcut"
        modifiers="accel"/>
 #endif
-  <key id="key_cut" key="&cutCmd.key;" modifiers="accel"/>
-  <key id="key_copy" key="&copyCmd.key;" modifiers="accel"/>
-  <key id="key_paste" key="&pasteCmd.key;" modifiers="accel"/>
+  <key id="key_cut" data-l10n-id="text-action-cut-shortcut" modifiers="accel"/>
+  <key id="key_copy" data-l10n-id="text-action-copy-shortcut" modifiers="accel"/>
+  <key id="key_paste" data-l10n-id="text-action-paste-shortcut" modifiers="accel"/>
   <key id="pastequotationkb" key="&pasteAsQuotationCmd.key;"
        observes="cmd_pasteQuote" modifiers="accel, shift"/>
   <key id="pastenoformattingkb" key="&pasteNoFormattingCmd.key;"
        modifiers="accel, shift" observes="cmd_pasteNoFormatting"/>
   <key id="key_rewrap" key="&editRewrapCmd.key;" command="cmd_rewrap" modifiers="accel"/>
 #ifdef XP_MACOSX
   <key id="key_delete" keycode="VK_BACK" command="cmd_delete"/>
   <key id="key_delete2" keycode="VK_DELETE" command="cmd_delete"/>
@@ -423,17 +423,17 @@
        command="cmd_renameAttachment"/>
   <key id="key_toggleAttachmentPane"
        key="&attachments.accesskey;" modifiers="alt"
        oncommand="keyToggleAttachmentPaneOnCommand();"/>
 #endif
   <key id="key_reorderAttachments"
        key="&reorderAttachmentsCmd.key;" modifiers="accel,shift"
        command="cmd_reorderAttachments"/>
-  <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
+  <key id="key_selectAll" data-l10n-id="text-action-select-all-shortcut" modifiers="accel"/>
   <key id="key_find" key="&findBarCmd.key;" command="cmd_find" modifiers="accel"/>
 #ifndef XP_MACOSX
   <key id="key_findReplace" key="&findReplaceCmd.key;" command="cmd_findReplace" modifiers="accel"/>
 #endif
   <key id="key_findNext" key="&findAgainCmd.key;" command="cmd_findNext" modifiers="accel"/>
   <key id="key_findPrev" key="&findPrevCmd.key;" command="cmd_findPrev" modifiers="accel, shift"/>
   <key keycode="&findAgainCmd.key2;" command="cmd_findNext"/>
   <key keycode="&findPrevCmd.key2;"  command="cmd_findPrev" modifiers="shift"/>
--- a/mail/locales/en-US/chrome/communicator/utilityOverlay.dtd
+++ b/mail/locales/en-US/chrome/communicator/utilityOverlay.dtd
@@ -7,27 +7,21 @@
 <!ENTITY fileMenu.label          "File">
 <!ENTITY fileMenu.accesskey        "F">
 <!ENTITY newMenu.label            "New">
 <!ENTITY newMenu.accesskey          "N">
 
 <!ENTITY editMenu.label          "Edit">
 <!ENTITY editMenu.accesskey        "E">
 <!ENTITY undoCmd.label            "Undo">
-<!ENTITY undoCmd.key            "Z">
 <!ENTITY undoCmd.accesskey          "U">
 <!ENTITY redoCmd.label            "Redo">
-<!ENTITY redoCmd.key            "Y">
 <!ENTITY redoCmd.accesskey          "R">
-<!ENTITY cutCmd.key              "X">
-<!ENTITY copyCmd.key            "C">
-<!ENTITY pasteCmd.key            "V">
 <!ENTITY deleteCmd.label          "Delete">
 <!ENTITY deleteCmd.accesskey        "D">
-<!ENTITY selectAllCmd.key          "A">
 <!ENTITY preferencesCmd2.label "Options">
 <!ENTITY preferencesCmd2.accesskey "O">
 <!ENTITY preferencesCmdUnix.label       "Preferences">
 <!ENTITY preferencesCmdUnix.accesskey     "n">
 
 <!ENTITY viewMenu.label          "View">
 <!ENTITY viewMenu.accesskey        "V">
 <!ENTITY viewToolbarsMenu.label        "Toolbars">
--- a/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
@@ -39,29 +39,23 @@
 <!ENTITY printContactCmd.accesskey                      "P">
 <!ENTITY printContactCmd.key                            "P">
 <!ENTITY printAddressBook.label                         "Print Address Book…">
 <!ENTITY printAddressBook.accesskey                     "A">
 
 <!-- Edit Menu -->
 <!ENTITY editMenu.label                                 "Edit">
 <!ENTITY editMenu.accesskey                             "E">
-<!ENTITY undoCmd.key                                    "Z">
-<!ENTITY redoCmd.key                                    "Y">
-<!ENTITY cutCmd.key                                     "X">
-<!ENTITY copyCmd.key                                    "C">
-<!ENTITY pasteCmd.key                                   "V">
 <!ENTITY deleteCmd.label                                "Delete">
 <!ENTITY deleteAbCmd.label                              "Delete Address Book">
 <!ENTITY deleteContactCmd.label                         "Delete Contact">
 <!ENTITY deleteContactsCmd.label                        "Delete Contacts">
 <!ENTITY deleteListCmd.label                            "Delete List">
 <!ENTITY deleteListsCmd.label                           "Delete Lists">
 <!ENTITY deleteItemsCmd.label                           "Delete Items">
-<!ENTITY selectAllCmd.key                               "A">
 <!ENTITY searchAddressesCmd.key                         "f">
 <!ENTITY swapFirstNameLastNameCmd.label                 "Swap First/Last Name">
 <!ENTITY swapFirstNameLastNameCmd.accesskey             "w">
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY hideSwapFnLnUI "true">
 <!ENTITY propertiesMenu.label                           "Properties">
 <!ENTITY propertiesMenu.accesskey                       "i">
--- a/mail/locales/en-US/chrome/messenger/viewSource.dtd
+++ b/mail/locales/en-US/chrome/messenger/viewSource.dtd
@@ -7,16 +7,18 @@
 <!-- LOCALIZATION NOTE (mainWindow.title) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.title "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifierseparator) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifierseparator " - ">
 <!ENTITY mainWindow.preface "Source of: ">
 
+<!ENTITY editMenu.label "Edit">
+<!ENTITY editMenu.accesskey "E">
 <!ENTITY fileMenu.label "File">
 <!ENTITY fileMenu.accesskey "F">
 <!ENTITY savePageCmd.label "Save Page As…">
 <!ENTITY savePageCmd.accesskey "A">
 <!ENTITY savePageCmd.commandkey "S">
 <!ENTITY pageSetupCmd.label "Page Setup…">
 <!ENTITY pageSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "Print Preview">