Bug 913826 - New social bookmark button: rename entities to reflect string changes. r=mixedpuppy
authorFrancesco Lodolo <flod@lodolo.net>
Wed, 11 Sep 2013 09:51:03 -0400
changeset 146675 7fa0fd335e9f78d21d2b7c22d30884e26e9b695a
parent 146674 169a0df8cdb4c0616ce2f9a1813be9b1e8083bff
child 146676 a1a846de1a8aff4c1bd00f7e72e2c912222f108f
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmixedpuppy
bugs913826
milestone26.0a1
Bug 913826 - New social bookmark button: rename entities to reflect string changes. r=mixedpuppy
browser/base/content/browser-context.inc
browser/base/content/browser-social.js
browser/base/content/test/social/head.js
browser/locales/en-US/chrome/browser/browser.dtd
browser/locales/en-US/chrome/browser/browser.properties
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -41,17 +41,17 @@
                 label="&shareLinkCmd.label;"
                 accesskey="&shareLinkCmd.accesskey;"
                 oncommand="gContextMenu.shareLink();"/>
       <menuitem id="context-savelink"
                 label="&saveLinkCmd.label;"
                 accesskey="&saveLinkCmd.accesskey;"
                 oncommand="gContextMenu.saveLink();"/>
       <menu id="context-marklinkMenu" label="&social.marklinkMenu.label;"
-            accesskey="&social.marklink.accesskey;">
+            accesskey="&social.marklinkMenu.accesskey;">
         <menupopup/>
       </menu>
       <menuitem id="context-copyemail"
                 label="&copyEmailCmd.label;"
                 accesskey="&copyEmailCmd.accesskey;"
                 oncommand="gContextMenu.copyEmail();"/>
       <menuitem id="context-copylink"
                 label="&copyLinkCmd.label;"
@@ -247,17 +247,17 @@
                 label="&sharePageCmd.label;"
                 accesskey="&sharePageCmd.accesskey;"
                 oncommand="SocialShare.sharePage();"/>
       <menuitem id="context-savepage"
                 label="&savePageCmd.label;"
                 accesskey="&savePageCmd.accesskey2;"
                 oncommand="gContextMenu.savePageAs();"/>
       <menu id="context-markpageMenu" label="&social.markpageMenu.label;"
-            accesskey="&social.markpage.accesskey;">
+            accesskey="&social.markpageMenu.accesskey;">
         <menupopup/>
       </menu>
       <menuseparator id="context-sep-viewbgimage"/>
       <menuitem id="context-viewbgimage"
                 label="&viewBGImageCmd.label;"
                 accesskey="&viewBGImageCmd.accesskey;"
                 oncommand="gContextMenu.viewBGImage(event);"
                 onclick="checkForMiddleClick(this, event);"/>
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -1653,22 +1653,22 @@ SocialMarks = {
     // remove all previous entries by class
     let menus = [m for (m of document.getElementsByClassName("context-socialmarks"))];
     [m.parentNode.removeChild(m) for (m of menus)];
 
     let contextMenus = [
       {
         type: "link",
         id: "context-marklinkMenu",
-        label: "social.marklink.label"
+        label: "social.marklinkMenu.label"
       },
       {
         type: "page",
         id: "context-markpageMenu",
-        label: "social.markpage.label"
+        label: "social.markpageMenu.label"
       }
     ];
     for (let cfg of contextMenus) {
       this._populateContextPopup(cfg, providers);
     }
   },
 
   MENU_LIMIT: 3, // adjustable for testing
--- a/browser/base/content/test/social/head.js
+++ b/browser/base/content/test/social/head.js
@@ -247,22 +247,22 @@ function checkSocialUI(win) {
   if (provider) {
     for (let id of ["menu_socialSidebar", "menu_socialAmbientMenu"])
       _is(document.getElementById(id).getAttribute("label"), Social.provider.name, "element has the provider name");
 
     let contextMenus = [
       {
         type: "link",
         id: "context-marklinkMenu",
-        label: "social.marklink.label"
+        label: "social.marklinkMenu.label"
       },
       {
         type: "page",
         id: "context-markpageMenu",
-        label: "social.markpage.label"
+        label: "social.markpageMenu.label"
       }
     ];
 
     for (let c of contextMenus) {
       let leMenu = document.getElementById(c.id);
       let parent, menus;
       let markProviders = SocialMarks.getProviders();
       if (markProviders.length > SocialMarks.MENU_LIMIT) {
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -640,19 +640,19 @@ just addresses the organization to follo
 <!ENTITY social.learnMore.label "Learn more…">
 <!ENTITY social.learnMore.accesskey "l">
 <!ENTITY social.closeNotificationItem.label "Not Now">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
-<!ENTITY social.markpage.accesskey "P">
+<!ENTITY social.markpageMenu.accesskey "P">
 <!ENTITY social.markpageMenu.label "Save Page To…">
-<!ENTITY social.marklink.accesskey "L">
+<!ENTITY social.marklinkMenu.accesskey "L">
 <!ENTITY social.marklinkMenu.label "Save Link To…">
 
 <!ENTITY getUserMedia.selectCamera.label "Camera to share:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microphone to share:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 
 <!ENTITY webrtcIndicatorButton.label "Camera / Microphone Access">
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -425,20 +425,20 @@ service.install.learnmore=Learn More…
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label=Turn off %S
 social.turnOff.accesskey=T
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label=Turn on %S
 social.turnOn.accesskey=T
 
-# LOCALIZATION NOTE (social.markpage.label): %S is the name of the social provider
-social.markpage.label=Save Page to %S
-# LOCALIZATION NOTE (social.marklink.label): %S is the name of the social provider
-social.marklink.label=Save Link to %S
+# LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
+social.markpageMenu.label=Save Page to %S
+# LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
+social.marklinkMenu.label=Save Link to %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S is unable to connect with %2$S right now.
 social.error.tryAgain.label=Try Again
 social.error.tryAgain.accesskey=T
 social.error.closeSidebar.label=Close This Sidebar
 social.error.closeSidebar.accesskey=C