Bug 1210331 - Clean up strings for conversations panel and conversation invite [r=Standard8]

browser/components/loop/content/js/panel.js

@@ -729,19 +729,19 @@ loop.panel = (function(_, mozL10n) {
             className: "dropdown-menu-item", 
             onClick: this.props.handleCopyButtonClick, 
             ref: "copyButton"}, 
-            mozL10n.get("copy_url_button2")
+            mozL10n.get("copy_link_menuitem")
           ), 
           React.createElement("li", {
             className: "dropdown-menu-item", 
             onClick: this.props.handleEmailButtonClick, 
             ref: "emailButton"}, 
-            mozL10n.get("email_link_button")
+            mozL10n.get("email_link_menuitem")
           ), 
           React.createElement("li", {
             className: "dropdown-menu-item", 
             onClick: this.props.handleDeleteButtonClick, 
             ref: "deleteButton"}, 
-            mozL10n.get("rooms_list_delete_tooltip")
+            mozL10n.get("delete_conversation_menuitem")
           )
         )
       );

browser/components/loop/content/js/panel.jsx

@@ -729,19 +729,19 @@ loop.panel = (function(_, mozL10n) {
             className="dropdown-menu-item"
             onClick={this.props.handleCopyButtonClick}
             ref="copyButton">
-            {mozL10n.get("copy_url_button2")}
+            {mozL10n.get("copy_link_menuitem")}
           </li>
           <li
             className="dropdown-menu-item"
             onClick={this.props.handleEmailButtonClick}
             ref="emailButton">
-            {mozL10n.get("email_link_button")}
+            {mozL10n.get("email_link_menuitem")}
           </li>
           <li
             className="dropdown-menu-item"
             onClick={this.props.handleDeleteButtonClick}
             ref="deleteButton">
-            {mozL10n.get("rooms_list_delete_tooltip")}
+            {mozL10n.get("delete_conversation_menuitem")}
           </li>
         </ul>
       );

browser/components/loop/content/js/roomViews.js

@@ -297,14 +297,14 @@ loop.roomViews = (function(mozL10n) {
               }), 
               onClick: this.handleCopyButtonClick}, 
               React.createElement("img", {src: "loop/shared/img/svg/glyph-link-16x16.svg"}), 
-              React.createElement("p", null, mozL10n.get("invite_copy_" +
-                (this.state.copiedUrl ? "triggered" : "button")))
+              React.createElement("p", null, mozL10n.get(this.state.copiedUrl ?
+                "invite_copied_link_button" : "invite_copy_link_button"))
             ), 
             React.createElement("div", {className: "btn-email invite-button", 
               onClick: this.handleEmailButtonClick, 
               onMouseOver: this.resetTriggeredButtons}, 
               React.createElement("img", {src: "loop/shared/img/svg/glyph-email-16x16.svg"}), 
-              React.createElement("p", null, mozL10n.get("invite_email_button"))
+              React.createElement("p", null, mozL10n.get("invite_email_link_button"))
             )
           ), 
           React.createElement(SocialShareDropdown, {

browser/components/loop/content/js/roomViews.jsx

@@ -297,14 +297,14 @@ loop.roomViews = (function(mozL10n) {
               })}
               onClick={this.handleCopyButtonClick}>
               <img src="loop/shared/img/svg/glyph-link-16x16.svg" />
-              <p>{mozL10n.get("invite_copy_" +
-                (this.state.copiedUrl ? "triggered" : "button"))}</p>
+              <p>{mozL10n.get(this.state.copiedUrl ?
+                "invite_copied_link_button" : "invite_copy_link_button")}</p>
             </div>
             <div className="btn-email invite-button"
               onClick={this.handleEmailButtonClick}
               onMouseOver={this.resetTriggeredButtons}>
               <img src="loop/shared/img/svg/glyph-email-16x16.svg" />
-              <p>{mozL10n.get("invite_email_button")}</p>
+              <p>{mozL10n.get("invite_email_link_button")}</p>
             </div>
           </div>
           <SocialShareDropdown

browser/components/loop/standalone/content/l10n/en-US/loop.properties

@@ -57,9 +57,6 @@ rooms_default_room_name_template=Conversation {{conversationLabel}}
 ## by the user specified conversation name.
 rooms_welcome_title=Welcome to {{conversationName}}
 rooms_leave_button_label=Leave
-rooms_list_copy_url_tooltip=Copy Link
-rooms_list_delete_tooltip=Delete conversation
-rooms_list_deleteConfirmation_label=Are you sure?
 rooms_new_room_button_label=Start a conversation
 rooms_only_occupant_label2=You're the only one here.
 rooms_panel_title=Choose a conversation or start a new one

browser/components/loop/test/desktop-local/roomViews_test.js

@@ -267,8 +267,7 @@ describe("loop.roomViews", function () {
         var copyBtn = view.getDOMNode().querySelector(".btn-copy");
         React.addons.TestUtils.Simulate.click(copyBtn);
 
-        // invite_copy_triggered is the l10n string.
-        expect(copyBtn.textContent).eql("invite_copy_triggered");
+        expect(copyBtn.textContent).eql("invite_copied_link_button");
       });
 
       it("should keep the text for a while after the url has been copied", function() {
@@ -276,8 +275,7 @@ describe("loop.roomViews", function () {
         React.addons.TestUtils.Simulate.click(copyBtn);
         clock.tick(loop.roomViews.DesktopRoomInvitationView.TRIGGERED_RESET_DELAY / 2);
 
-        // invite_copy_triggered is the l10n string.
-        expect(copyBtn.textContent).eql("invite_copy_triggered");
+        expect(copyBtn.textContent).eql("invite_copied_link_button");
       });
 
       it("should reset the text a bit after the url has been copied", function() {
@@ -285,8 +283,7 @@ describe("loop.roomViews", function () {
         React.addons.TestUtils.Simulate.click(copyBtn);
         clock.tick(loop.roomViews.DesktopRoomInvitationView.TRIGGERED_RESET_DELAY);
 
-        // invite_copy_button is the l10n string.
-        expect(copyBtn.textContent).eql("invite_copy_button");
+        expect(copyBtn.textContent).eql("invite_copy_link_button");
       });
 
       it("should reset the text after the url has been copied then mouse over another button", function() {
@@ -295,8 +292,7 @@ describe("loop.roomViews", function () {
         var emailBtn = view.getDOMNode().querySelector(".btn-email");
         React.addons.TestUtils.Simulate.mouseOver(emailBtn);
 
-        // invite_copy_button is the l10n string.
-        expect(copyBtn.textContent).eql("invite_copy_button");
+        expect(copyBtn.textContent).eql("invite_copy_link_button");
       });
     });
 

browser/locales/en-US/chrome/browser/loop/loop.properties

@@ -30,21 +30,14 @@ first_time_experience_button_label=Get Started
 ## user to create his or her first conversation.
 first_time_experience_subheading=Join the conversation
 
-invite_header_text=Invite someone to join you.
 invite_header_text2=Invite a friend to join you
-## LOCALIZATION_NOTE(invite_facebook_button, invite_facebook_triggered,
-## invite_contacts_button, invite_contacts_triggered, invite_copy_button,
-## invite_copy_triggered, invite_email_button, invite_email_triggered): These
-## button/triggered pairs are labels under an iconic button that switch to the
-## triggered text when clicked/activated.
-invite_facebook_button=share on Facebook
-invite_facebook_triggered=shared!
-invite_contacts_button=share with contacts
-invite_contacts_triggered=shared!
-invite_copy_button=copy link
-invite_copy_triggered=copied!
-invite_email_button=email link
-invite_email_triggered=emailed!
+## LOCALIZATION_NOTE(invite_copy_link_button, invite_copied_link_button,
+## invite_email_link_button, invite_facebook_button2): These labels appear under
+## an iconic button for the invite view.
+invite_copy_link_button=Copy Link
+invite_copied_link_button=Copied!
+invite_email_link_button=Email Link
+invite_facebook_button2=Share on Facebook
 
 # Status text
 display_name_guest=Guest
@@ -85,8 +78,12 @@ share_tweet=Join me for a video conversation on {{clientShortname2}}!
 
 share_button3=Share Link
 share_add_service_button=Add a Service
-copy_url_button2=Copy Link
-copied_url_button=Copied!
+
+## LOCALIZATION NOTE (copy_link_menuitem, email_link_menuitem, delete_conversation_menuitem):
+## These menu items are displayed from a panel's context menu for a conversation.
+copy_link_menuitem=Copy Link
+email_link_menuitem=Email Link
+delete_conversation_menuitem=Delete conversation
 
 panel_footer_signin_or_signup_link=Sign In or Sign Up
 
@@ -291,10 +288,9 @@ contact_offline_title=This person is not online
 ## when the call didn't go through.
 call_timeout_notification_text=Your call did not go through.
 
-## LOCALIZATION NOTE (retry_call_button, cancel_button, email_link_button):
+## LOCALIZATION NOTE (retry_call_button, cancel_button):
 ## These buttons are displayed when a call has failed.
 retry_call_button=Retry
-email_link_button=Email Link
 cancel_button=Cancel
 rejoin_button=Rejoin Conversation
 
@@ -334,12 +330,9 @@ tour_label=Tour
 ## will be replaced by a number. For example "Conversation 1" or "Conversation 12".
 rooms_default_room_name_template=Conversation {{conversationLabel}}
 rooms_leave_button_label=Leave
-rooms_list_copy_url_tooltip=Copy Link
 ## LOCALIZATION NOTE (rooms_list_recent_conversations): String is in all caps
 ## for emphasis reasons, it is a heading. Proceed as appropriate for locale.
 rooms_list_recent_conversations=RECENT CONVERSATIONS
-rooms_list_delete_tooltip=Delete conversation
-rooms_list_deleteConfirmation_label=Are you sure?
 rooms_change_failed_label=Conversation cannot be updated
 rooms_new_room_button_label=Start a conversation
 rooms_panel_title=Choose a conversation or start a new one
@@ -370,18 +363,10 @@ context_inroom_header=Let's Talk About…
 # to consider this as a stand-alone title. See example screenshot:
 # https://bug1115342.bugzilla.mozilla.org/attachment.cgi?id=8563677
 context_inroom_label2=Let's Talk About:
-## LOCALIZATION_NOTE (context_edit_activate_label): {{title}} will be replaced
-## by the title of the active tab, also known as the title of an HTML document.
-## The quotes around the title are intentional.
-context_edit_activate_label=Talk about "{{title}}"
 context_edit_name_placeholder=Conversation Name
 context_edit_comments_placeholder=Comments
-context_add_some_label=Add some context
-context_show_tooltip=Show Context
 context_cancel_label=Cancel
 context_done_label=Done
-context_link_modified=This link was modified.
-context_learn_more_link_label=Learn more.
 conversation_settings_menu_edit_context=Edit Context
 conversation_settings_menu_hide_context=Hide Context