Fix mozilla#3231 Properly localize the Notes featured experiment term…

…s and privacy notice. (mozilla#3286)

* Fix mozilla#3231 Properly localize the Notes featured experiment terms and privacy notice.

* Re-enable skipped tests.

* Switch to a much simpler LocalizedHtml implementation.

content-src/experiments/notes.yaml

@@ -1,7 +1,7 @@
 id: 15
 title: 'Notes'
 slug: notes
-is_featured: false
+is_featured: true
 platforms: ['addon']
 min_release: 54
 thumbnail: /static/images/experiments/notes/experiments_experiment/thumbnail.png
@@ -17,6 +17,7 @@ changelog_url: 'https://github.com/mozilla/notes/releases'
 contribute_url: 'https://github.com/mozilla/notes'
 bug_report_url: 'https://github.com/mozilla/notes/issues'
 discourse_url: 'https://discourse.mozilla-community.org/c/test-pilot/notes'
+legal_notice: By proceeding, you agree to the <a>terms</a> and <a>privacy</a> policies of Test Pilot and the <a>Notes privacy policy</a>.
 privacy_notice_url: 'https://github.com/mozilla/notes/blob/master/docs/metrics.md'
 measurements:
   - >

frontend/src/app/components/FeaturedExperiment/FeaturedButton.js

@@ -2,6 +2,7 @@
 
 import React from "react";
 import { Localized } from "fluent-react/compat";
+import LocalizedHtml from "../LocalizedHtml";
 import { buildSurveyURL, experimentL10nId } from "../../lib/utils";
 
 import Modal from "../Modal";
@@ -41,26 +42,21 @@ export default class FeaturedButton extends React.Component {
   };
 
   renderLegalLink() {
-    const { title } = this.props.experiment;
-
-    const terms = <Localized id="landingLegalNoticeTermsOfUse">
-      <a href="/terms">terms</a>
-    </Localized>;
-    const privacy = <Localized id="landingLegalNoticePrivacyNotice">
-      <a href="/privacy">privacy</a>
-    </Localized>;
-
     const launchLegalModal = (ev) => {
       ev.preventDefault();
       this.setState({ showLegalDialog: true });
     };
 
-    return (<Localized id={this.l10nId("legal-link")}>
+    const { title } = this.props.experiment;
+
+    return (<LocalizedHtml id={this.l10nId("legal-notice")}
+      $title={title}>
       <p className="main-install__legal">
-        By proceeding, you agree to the {terms} and {privacy} of Test Pilot
-        and <a href="#" onClick={launchLegalModal}>{title}</a>.
+        By proceeding, you agree to the <a href="/terms">terms</a>
+        and <a href="/privacy">privacy</a> policies of Test Pilot and the
+        <a href="#" onClick={launchLegalModal}>{title} privacy policy</a>.
       </p>
-    </Localized>);
+    </LocalizedHtml>);
   }
 
   renderLegalModal() {

frontend/tasks/util.js

@@ -10,7 +10,8 @@ const LOCALIZABLE_FIELDS = [
   "details.copy",
   "tour_steps.copy",
   "contributors.title",
-  "contributors_extra"
+  "contributors_extra",
+  "legal_notice"
 ];
 
 function isLocalizableField(pieces) {

frontend/test/ui/test_homepage.py

@@ -27,8 +27,6 @@ def test_install_button_loads(base_url, selenium):
         assert True
 
 
-@pytest.mark.skipif(
-  True, reason='Skip featured experiment tests.')
 @pytest.mark.nondestructive
 def test_featured_experiment_actions(base_url, selenium):
     """Test if featured experiment action buttons exists"""
@@ -39,8 +37,6 @@ def test_featured_experiment_actions(base_url, selenium):
         assert True
 
 
-@pytest.mark.skipif(
-  True, reason='Skip featured experiment tests.')
 @pytest.mark.nondestructive
 def test_featured_experiment(base_url, selenium):
     """Test if featured experiment video exists"""

locales/en-US/experiments.ftl

@@ -71,6 +71,7 @@ nomore404sContributors2Title = Director, Wayback Machine, The Internet Archive
 nomore404sContributors3Title = Senior Crawl Engineer, The Internet Archive
 notesDescription = A simple notepad built into Firefox. Ever need to jot something down while you browse the web? This is the experiment for you.
 notesIntroduction = Notes adds a simple, one-page notepad to your browser’s sidebar. We’ve added a few basic formatting options to start, but we want your feedback to tell us what features you’d like to see us add.
+notesLegalnotice = By proceeding, you agree to the <a>terms</a> and <a>privacy</a> policies of Test Pilot and the <a>Notes privacy policy</a>.
 notesMeasurements0 = Notes will collect information about your use of the feature, such as how often you create notes and how long you spend editing them, the number of characters you save in your notes, and whether you use any editing features (e.g., bold or stylized text).
 notesMeasurements1 = Notes will also collect information about your interaction with the add-on, such as how you access the feature, and what buttons you may click.
 notesDetails0Copy = It’s a notepad. Why didn’t we think of this earlier?