Bug 1081095 - Fix a couple of issues on the standalone start page with Firefox Hello information. r=Standard8
authorJared Wein <jwein@mozilla.com>
Sun, 12 Oct 2014 20:31:05 +0100
changeset 210076 58a7392bde36384eaaec30381de775e9ba6fe01e
parent 210026 199fb29c3467cbf06cd4e7d6ef5ea2323530d211
child 210077 3577deeda15644cc343ccbd4c5b13dd0b7ba008c
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersStandard8
bugs1081095
milestone35.0a1
Bug 1081095 - Fix a couple of issues on the standalone start page with Firefox Hello information. r=Standard8
browser/components/loop/standalone/content/js/webapp.js
browser/components/loop/standalone/content/js/webapp.jsx
browser/components/loop/standalone/content/l10n/loop.en-US.properties
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -112,18 +112,17 @@ loop.webapp = (function($, _, OT, mozL10
       );
     }
   });
 
   var ConversationBranding = React.createClass({displayName: 'ConversationBranding',
     render: function() {
       return (
         React.DOM.h1({className: "standalone-header-title"}, 
-          React.DOM.strong(null, mozL10n.get("brandShortname")), 
-          mozL10n.get("clientShortname2")
+          React.DOM.strong(null, mozL10n.get("clientShortname2"))
         )
       );
     }
   });
 
   /**
    * The Firefox Marketplace exposes a web page that contains a postMesssage
    * based API that wraps a small set of functionality from the WebApps API
@@ -452,16 +451,17 @@ loop.webapp = (function($, _, OT, mozL10
       }
     },
 
     render: function() {
       var tosLinkName = mozL10n.get("terms_of_use_link_text");
       var privacyNoticeName = mozL10n.get("privacy_notice_link_text");
 
       var tosHTML = mozL10n.get("legal_text_and_links", {
+        "clientShortname": mozL10n.get("clientShortname2"),
         "terms_of_use_url": "<a target=_blank href='" +
           mozL10n.get("legal_website") + "'>" +
           tosLinkName + "</a>",
         "privacy_notice_url": "<a target=_blank href='" +
           mozL10n.get("privacy_website") + "'>" + privacyNoticeName + "</a>"
       });
 
       var tosClasses = React.addons.classSet({
--- a/browser/components/loop/standalone/content/js/webapp.jsx
+++ b/browser/components/loop/standalone/content/js/webapp.jsx
@@ -112,18 +112,17 @@ loop.webapp = (function($, _, OT, mozL10
       );
     }
   });
 
   var ConversationBranding = React.createClass({
     render: function() {
       return (
         <h1 className="standalone-header-title">
-          <strong>{mozL10n.get("brandShortname")}</strong>
-          {mozL10n.get("clientShortname2")}
+          <strong>{mozL10n.get("clientShortname2")}</strong>
         </h1>
       );
     }
   });
 
   /**
    * The Firefox Marketplace exposes a web page that contains a postMesssage
    * based API that wraps a small set of functionality from the WebApps API
@@ -452,16 +451,17 @@ loop.webapp = (function($, _, OT, mozL10
       }
     },
 
     render: function() {
       var tosLinkName = mozL10n.get("terms_of_use_link_text");
       var privacyNoticeName = mozL10n.get("privacy_notice_link_text");
 
       var tosHTML = mozL10n.get("legal_text_and_links", {
+        "clientShortname": mozL10n.get("clientShortname2"),
         "terms_of_use_url": "<a target=_blank href='" +
           mozL10n.get("legal_website") + "'>" +
           tosLinkName + "</a>",
         "privacy_notice_url": "<a target=_blank href='" +
           mozL10n.get("privacy_website") + "'>" + privacyNoticeName + "</a>"
       });
 
       var tosClasses = React.addons.classSet({
--- a/browser/components/loop/standalone/content/l10n/loop.en-US.properties
+++ b/browser/components/loop/standalone/content/l10n/loop.en-US.properties
@@ -33,17 +33,17 @@ call_url_unavailable_notification_headin
 call_url_unavailable_notification_message2=Sorry, this URL is not available. It may be expired or entered incorrectly.
 promote_firefox_hello_heading=Download {{brandShortname}} to make free audio and video calls!
 get_firefox_button=Get {{brandShortname}}
 initiate_call_button_label2=Ready to start your conversation?
 initiate_audio_video_call_button2=Start
 initiate_audio_video_call_tooltip2=Start a video conversation
 initiate_audio_call_button2=Voice conversation
 initiate_call_cancel_button=Cancel
-legal_text_and_links=By using this product you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}
+legal_text_and_links=By using {{clientShortname}} you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}
 terms_of_use_link_text=Terms of use
 privacy_notice_link_text=Privacy notice
 invite_header_text=Invite someone to join you.
 
 ## LOCALIZATION NOTE(brandShortname): This should not be localized and
 ## should remain "Firefox" for all locales.
 brandShortname=Firefox
 ## LOCALIZATION NOTE(clientShortname2): This should not be localized and