Fix mozilla#2791 Make sure all <Localized> instances have default con…

…tent (mozilla#2890)
danivijay · Sep 27, 2017 · c17175c · c17175c
1 parent 9796496
commit c17175c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/frontend/src/app/components/ExperimentDisableDialog.js b/frontend/src/app/components/ExperimentDisableDialog.js
@@ -28,7 +28,7 @@ export default class ExperimentDisableDialog extends React.Component {
         <div id="disabled-feedback-modal" className="modal feedback-modal modal-bounce-in">
           <header className="modal-header-wrapper">
             <Localized id="feedbackUninstallTitle" $title={ experiment.title }>
-              <h3 className="modal-header" />
+              <h3 className="modal-header">Thank You!</h3>
             </Localized>
             <div className="modal-cancel" onClick={e => this.cancel(e)} />
           </header>

diff --git a/frontend/src/app/components/ExperimentEolDialog.js b/frontend/src/app/components/ExperimentEolDialog.js
@@ -26,12 +26,16 @@ export default class ExperimentEolDialog extends React.Component {
           <form>
             <div className="modal-content">
               <Localized id="eolDisableMessage" $title={title}>
-                <p className="centered"></p>
+                <p className="centered">
+                  The {title} experiment has ended. Once you uninstall it you won&apos;t be able to re-install it through Test Pilot again.
+                </p>
               </Localized>
             </div>
             <div className="modal-actions">
               <Localized id="disableExperiment" $title={title}>
-                <button onClick={e => this.proceed(e)} className="submit button warning large"></button>
+                <button onClick={e => this.proceed(e)} className="submit button warning large">
+                  Disable {title}
+                </button>
               </Localized>
             </div>
           </form>

diff --git a/frontend/src/app/components/ExperimentPreFeedbackDialog.js b/frontend/src/app/components/ExperimentPreFeedbackDialog.js
@@ -23,7 +23,7 @@ export default class ExperimentPreFeedbackDialog extends React.Component {
         <div className={classnames('modal', 'tour-modal')}>
           <header className="modal-header-wrapper">
             <Localized id="experimentPreFeedbackTitle" $title={experiment.title}>
-              <h3 className="modal-header"></h3>
+              <h3 className="modal-header">{experiment.title} feedback</h3>
             </Localized>
             <div className="modal-cancel" onClick={e => this.cancel(e)}/>
           </header>
@@ -38,7 +38,7 @@ export default class ExperimentPreFeedbackDialog extends React.Component {
               <div className="tour-text">
                 <Localized id="experimentPreFeedbackLinkCopy" $title={experiment.title}>
                   <a onClick={e => this.feedback(e)}
-                     href={surveyURL}></a>
+                     href={surveyURL}>Give feedback about the {experiment.title} experiment</a>
                 </Localized>
               </div>
             </div>

diff --git a/frontend/src/app/components/ExperimentRowCard/index.js b/frontend/src/app/components/ExperimentRowCard/index.js
@@ -55,13 +55,13 @@ export default class ExperimentRowCard extends React.Component {
       >
         <div className="experiment-actions">
           {enabled && <Localized id="experimentListEnabledTab">
-            <div className="tab enabled-tab"></div>
+            <div className="tab enabled-tab">Enabled</div>
           </Localized>}
           {this.justLaunched() && <Localized id="experimentListJustLaunchedTab">
-            <div className="tab just-launched-tab"></div>
+            <div className="tab just-launched-tab">Just Launched</div>
           </Localized>}
           {this.justUpdated() && <Localized id="experimentListJustUpdatedTab">
-            <div className="tab just-updated-tab"></div>
+            <div className="tab just-updated-tab">Just Updated</div>
           </Localized>}
         </div>
         <div className={`experiment-icon-wrapper-${experiment.slug} experiment-icon-wrapper`}>

diff --git a/frontend/src/app/components/ExperimentTourDialog.js b/frontend/src/app/components/ExperimentTourDialog.js
@@ -43,7 +43,7 @@ export default class ExperimentTourDialog extends React.Component {
 
     const headerTitle = enabled ? (
       <Localized id="tourOnboardingTitle" $title={experiment.title}>
-        <h3 className="modal-header"></h3>
+        <h3 className="modal-header">{experiment.title} enabled!</h3>
       </Localized>) : (<h3 className="modal-header">{experiment.title}</h3>);
 
     return (

diff --git a/frontend/src/app/components/NewsletterForm.js b/frontend/src/app/components/NewsletterForm.js
@@ -79,7 +79,9 @@ export default class NewsletterForm extends React.Component {
         <input name={fieldName} id={fieldName} type="checkbox" checked={this.props.privacy} required
                onChange={this.handlePrivacyClick} onClick={this.handlePrivacyClick} />
         { this.state.privacyNote ? <Localized id="newsletterFormPrivacyAgreementRequired">
-          <span></span>
+          <span>
+            Please check this box if you want to proceed.
+          </span>
         </Localized> : null }
         <LocalizedHtml id="newsletterFormPrivacyNotice">
           <span>

diff --git a/frontend/src/app/containers/ExperimentPage.js b/frontend/src/app/containers/ExperimentPage.js
@@ -257,7 +257,7 @@ export class ExperimentDetail extends React.Component {
                     </Localized>
                   </h2>
                   <Localized id="experimentPromoSubheader">
-                    <p className="banner__copy"></p>
+                    <p className="banner__copy">We&apos;re building next-generation features for Firefox. Install Test Pilot to try them!</p>
                   </Localized>
                   <MainInstallButton {...this.props}
                                      experimentTitle={title}
@@ -281,7 +281,7 @@ export class ExperimentDetail extends React.Component {
                 <span>{title} is enabled.</span>
               </Localized>}
               {(statusType === 'error') && <Localized id="installErrorMessage" $title={ title }>
-                <span><span></span></span>
+                <span>Uh oh. {title} could not be enabled. Try again later.</span>
               </Localized>}
             </div>
             <LayoutWrapper helperClass="details-header" flexModifier="row-between-breaking">
@@ -399,7 +399,7 @@ export class ExperimentDetail extends React.Component {
                             </ul>
                           </div>
                           {privacy_notice_url && <Localized id="experimentPrivacyNotice" $title={title}>
-                            <a className="privacy-policy" href={privacy_notice_url}><span></span></a>
+                            <a className="privacy-policy" href={privacy_notice_url}>You can learn more about the data collection for {title} here.</a>
                           </Localized>}
                         </section>}
                       </div>
@@ -650,7 +650,7 @@ export class ExperimentDetail extends React.Component {
       return (
         <div className="upgrade-notice">
           <Localized id="upgradeNoticeTitle" $title={title} $min_release={min_release}>
-            <div></div>
+            <div>{title} requires Firefox {min_release} or later.</div>
           </Localized>
           <Localized id="upgradeNoticeLink">
             <a onClick={e => this.clickUpgradeNotice(e)} href="https://support.mozilla.org/kb/find-what-version-firefox-you-are-using" target="_blank" rel="noopener noreferrer">How to update Firefox.</a>
@@ -666,7 +666,7 @@ export class ExperimentDetail extends React.Component {
       return (
         <div className="upgrade-notice">
           <Localized id="versionChangeNotice" $experiment_title={title}>
-            <div></div>
+            <div>{title} is not supported in this version of Firefox.</div>
           </Localized>
           <Localized id="versionChangeNoticeLink">
             <a onClick={e => this.clickUpgradeNotice(e)} href="https://www.mozilla.org/firefox/" target="_blank" rel="noopener noreferrer">Get the current version of Firefox.</a>
@@ -710,7 +710,7 @@ export class ExperimentDetail extends React.Component {
                 <span className="transition-text">Disabling...</span>
               </Localized>
               <Localized id="disableExperiment" $title={title}>
-                <span className="default-text"></span>
+                <span className="default-text">Disable {title}</span>
               </Localized>
             </button>
           </div>
@@ -722,7 +722,7 @@ export class ExperimentDetail extends React.Component {
       return <div className="experiment-controls">
         <button disabled onClick={e => { e.preventDefault(); }} style={{ minWidth: progressButtonWidth }} id="install-button"  className={classnames(['button', 'default'])}>
           <Localized id="experimentManuallyDisabled" $title={title}>
-            <span className="default-text"></span>
+            <span className="default-text">{title} disabled in Add-ons Manager</span>
           </Localized>
         </button>
       </div>;
@@ -737,7 +737,7 @@ export class ExperimentDetail extends React.Component {
             <span className="transition-text">Disabling...</span>
           </Localized>
           <Localized id="disableExperiment" $title={title}>
-            <span className="default-text"></span>
+            <span className="default-text">Disable {title}</span>
           </Localized>
         </button>
       </div>;