Bug 1277464 - Fixed Localization in text selection Context Menus; r?sebastian draft bug1277464
authorShan <11812r@gmail.com>
Tue, 20 Dec 2016 17:47:35 +0530
branchbug1277464
changeset 451466 dff6ed17ee5b0f3f537d2c4664f6f918f0868a9e
parent 451465 bcb104bb63c00a0c7673d416e23ebb72f472b5ab
child 724632 16a79ad33ffa7521d7e75cfad35a0170e50b38ed
push id39192
push userbmo:11812r@gmail.com
push dateTue, 20 Dec 2016 12:18:22 +0000
reviewerssebastian
bugs1277464
milestone53.0a1
Bug 1277464 - Fixed Localization in text selection Context Menus; r?sebastian MozReview-Commit-ID: 6QR5aHbeD97
mobile/android/chrome/content/ActionBarHandler.js
--- a/mobile/android/chrome/content/ActionBarHandler.js
+++ b/mobile/android/chrome/content/ActionBarHandler.js
@@ -322,17 +322,17 @@ var ActionBarHandler = {
 
   /**
    * Actionbar callback methods.
    */
   actions: {
 
     SELECT_ALL: {
       id: "selectall_action",
-      label: Strings.browser.GetStringFromName("contextmenu.selectAll"),
+      label: () => Strings.browser.GetStringFromName("contextmenu.selectAll"),
       icon: "drawable://ab_select_all",
       order: 5,
       floatingOrder: 5,
 
       selector: {
         matches: function(element, win) {
           // For editable, check its length. For default contentWindow, assume
           // true, else there'd been nothing to long-press to open ActionBar.
@@ -357,17 +357,17 @@ var ActionBarHandler = {
         // Close ActionBarHandler, then selectAll, and display handles.
         ActionBarHandler._getSelectAllController(element, win).selectAll();
         UITelemetry.addEvent("action.1", "actionbar", null, "select_all");
       },
     },
 
     CUT: {
       id: "cut_action",
-      label: Strings.browser.GetStringFromName("contextmenu.cut"),
+      label: () => Strings.browser.GetStringFromName("contextmenu.cut"),
       icon: "drawable://ab_cut",
       order: 4,
       floatingOrder: 1,
 
       selector: {
         matches: function(element, win) {
           // Can cut from editable, or design-mode document.
           if (!element && !ActionBarHandler._isInDesignMode(win)) {
@@ -402,17 +402,17 @@ var ActionBarHandler = {
 
         ActionBarHandler._uninit();
         UITelemetry.addEvent("action.1", "actionbar", null, "cut");
       },
     },
 
     COPY: {
       id: "copy_action",
-      label: Strings.browser.GetStringFromName("contextmenu.copy"),
+      label: () => Strings.browser.GetStringFromName("contextmenu.copy"),
       icon: "drawable://ab_copy",
       order: 3,
       floatingOrder: 2,
 
       selector: {
         matches: function(element, win) {
           // Don't allow "copy" from password fields.
           if (element instanceof Ci.nsIDOMHTMLInputElement &&
@@ -435,17 +435,17 @@ var ActionBarHandler = {
 
         ActionBarHandler._uninit();
         UITelemetry.addEvent("action.1", "actionbar", null, "copy");
       },
     },
 
     PASTE: {
       id: "paste_action",
-      label: Strings.browser.GetStringFromName("contextmenu.paste"),
+      label: () => Strings.browser.GetStringFromName("contextmenu.paste"),
       icon: "drawable://ab_paste",
       order: 2,
       floatingOrder: 3,
 
       selector: {
         matches: function(element, win) {
           // Can paste to editable, or design-mode document.
           if (!element && !ActionBarHandler._isInDesignMode(win)) {
@@ -468,17 +468,17 @@ var ActionBarHandler = {
           paste(Ci.nsIClipboard.kGlobalClipboard);
         ActionBarHandler._uninit();
         UITelemetry.addEvent("action.1", "actionbar", null, "paste");
       },
     },
 
     CALL: {
       id: "call_action",
-      label: Strings.browser.GetStringFromName("contextmenu.call"),
+      label: () => Strings.browser.GetStringFromName("contextmenu.call"),
       icon: "drawable://phone",
       order: 1,
       floatingOrder: 0,
 
       selector: {
         matches: function(element, win) {
           return (ActionBarHandler._getSelectedPhoneNumber() != null);
         },
@@ -525,17 +525,17 @@ var ActionBarHandler = {
         );
 
         UITelemetry.addEvent("action.1", "actionbar", null, "search");
       },
     },
 
     SEARCH_ADD: {
       id: "search_add_action",
-      label: Strings.browser.GetStringFromName("contextmenu.addSearchEngine3"),
+      label: () => Strings.browser.GetStringFromName("contextmenu.addSearchEngine3"),
       icon: "drawable://ab_add_search_engine",
       order: 0,
       floatingOrder: 8,
 
       selector: {
         matches: function(element, win) {
           if(!(element instanceof HTMLInputElement)) {
             return false;
@@ -570,17 +570,17 @@ var ActionBarHandler = {
             ActionBarHandler._sendActionBarActions(true);
           }
         });
       },
     },
 
     SHARE: {
       id: "share_action",
-      label: Strings.browser.GetStringFromName("contextmenu.share"),
+      label: () => Strings.browser.GetStringFromName("contextmenu.share"),
       icon: "drawable://ic_menu_share",
       order: 0,
       floatingOrder: 4,
 
       selector: {
         matches: function(element, win) {
           if (!ParentalControls.isAllowed(ParentalControls.SHARE)) {
             return false;