From 24a345cc21db28274f646aec33d6fa895e3909d1 Mon Sep 17 00:00:00 2001
From: "S. Gallagher" <sjgllghr@gmail.com>
Date: Sun, 4 Nov 2018 07:57:48 -0800
Subject: [PATCH] stop using FormattedHTMLMessage

---
 src/views/scratch_1.4/l10n.json        |  8 +++++--
 src/views/scratch_1.4/scratch_1.4.jsx  | 33 +++++++++++++++++++++++---
 src/views/scratch_1.4/scratch_1.4.scss |  4 ++--
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/views/scratch_1.4/l10n.json b/src/views/scratch_1.4/l10n.json
index 12f1bbd8e..40826ee9f 100644
--- a/src/views/scratch_1.4/l10n.json
+++ b/src/views/scratch_1.4/l10n.json
@@ -1,7 +1,8 @@
 {
   "onePointFour.title": "Scratch 1.4",
   "onePointFour.intro": "The previous version of Scratch, version 1.4, is still available for download.",
-  "onePointFour.introNote": "<b>Note:</b> You can still share projects from 1.4 to the Scratch website. However, projects created in Scratch 2.0 cannot be opened in 1.4.",
+  "onePointFour.introNoteLabel": "Note:",
+  "onePointFour.introNote": "{noteLabel} You can still share projects from 1.4 to the Scratch website. However, projects created in Scratch 2.0 cannot be opened in 1.4.",
   "onePointFour.downloads": "Downloads",
   "onePointFour.macTitle": "Mac OS X",
   "onePointFour.macBody": "Compatible with Mac OSX 10.4 or later",
@@ -18,7 +19,10 @@
   "onePointFour.linuxDownload": "download here",
   "onePointFour.faqsTitle": "Frequently Asked Questions",
   "onePointFour.resourcesQ": "What resources are available to help me learn how to use Scratch 1.4?",
-  "onePointFour.resourcesA": "For a step-by-step introduction, download the <a href=\"http://download.scratch.mit.edu/ScratchGettingStartedv14.pdf\">Scratch 1.4 Getting Started Guide</a>. The <a href=\"http://download.scratch.mit.edu/ScratchReferenceGuide14.pdf\">Scratch 1.4 Reference Guide</a> has a thorough explanation of the Scratch interface and programming language. <a href=\"http://download.scratch.mit.edu/ScratchCardsAll-v1.4-PDF.zip\">Scratch Cards</a> provide brief explanations that show how to make animations and interactive projects with Scratch.",
+  "onePointFour.gettingStartedGuide": "Scratch 1.4 Getting Started Guide",
+  "onePointFour.referenceGuide": "Scratch 1.4 Reference Guide",
+  "onePointFour.scratchCards": "Scratch Cards",
+  "onePointFour.resourcesA": "For a step-by-step introduction, download the {gettingStartedGuide}. The {referenceGuide} has a thorough explanation of the Scratch interface and programming language. {scratchCards} provide brief explanations that show how to make animations and interactive projects with Scratch.",
   "onePointFour.requirementsQ": "What are the system requirements for Scratch 1.4?",
   "onePointFour.requirementsDisplay": "Display: 800 x 480 or larger, thousands or millions of colors (16-bit color or greater) ",
   "onePointFour.requirementsOS": "Operating System: Windows 2000 or later, Mac OS X 10.4 or later, Ubuntu Linux 9.04 or later (For other versions of Linux, see the Linux Installer page) ",
diff --git a/src/views/scratch_1.4/scratch_1.4.jsx b/src/views/scratch_1.4/scratch_1.4.jsx
index 29f9a32a1..ec28dfb66 100644
--- a/src/views/scratch_1.4/scratch_1.4.jsx
+++ b/src/views/scratch_1.4/scratch_1.4.jsx
@@ -1,4 +1,3 @@
-const FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
 const FormattedMessage = require('react-intl').FormattedMessage;
 const React = require('react');
 
@@ -50,7 +49,14 @@ const OnePointFour = () => (
             >
                 <div className="inner">
                     <p className="callout">
-                        <FormattedHTMLMessage id="onePointFour.introNote" />
+                        <FormattedMessage
+                            id="onePointFour.introNote"
+                            values={{
+                                noteLabel: (
+                                    <b><FormattedMessage id="onePointFour.introNoteLabel" /></b>
+                                )
+                            }}
+                        />
                     </p>
                     <FlexRow className="three-col-row">
                         <div className="installation-column">
@@ -121,7 +127,28 @@ const OnePointFour = () => (
                     <span className="nav-spacer" />
                     <h2><FormattedMessage id="onePointFour.faqsTitle" /></h2>
                     <h3><FormattedMessage id="onePointFour.resourcesQ" /></h3>
-                    <p><FormattedHTMLMessage id="onePointFour.resourcesA" /></p>
+                    <p>
+                        <FormattedMessage
+                            id="onePointFour.resourcesA"
+                            values={{
+                                gettingStartedGuide: (
+                                    <a href="http://download.scratch.mit.edu/ScratchGettingStartedv14.pdf">
+                                        <FormattedMessage id="onePointFour.gettingStartedGuide" />
+                                    </a>
+                                ),
+                                referenceGuide: (
+                                    <a href="http://download.scratch.mit.edu/ScratchReferenceGuide14.pdf">
+                                        <FormattedMessage id="onePointFour.referenceGuide" />
+                                    </a>
+                                ),
+                                scratchCards: (
+                                    <a href="http://download.scratch.mit.edu/ScratchCardsAll-v1.4-PDF.zip">
+                                        <FormattedMessage id="onePointFour.scratchCards" />
+                                    </a>
+                                )
+                            }}
+                        />
+                    </p>
                     <h3><FormattedMessage id="onePointFour.requirementsQ" /></h3>
                     <p><FormattedMessage id="onePointFour.requirementsDisplay" /></p>
                     <p><FormattedMessage id="onePointFour.requirementsOS" /></p>
diff --git a/src/views/scratch_1.4/scratch_1.4.scss b/src/views/scratch_1.4/scratch_1.4.scss
index 86d353ac0..1183c9fdb 100644
--- a/src/views/scratch_1.4/scratch_1.4.scss
+++ b/src/views/scratch_1.4/scratch_1.4.scss
@@ -49,11 +49,11 @@
     .sub-nav-item {
         margin: .5rem;
     }
-    
+
     .callout {
         text-align: center;
     }
-    
+
     .download-content {
         padding-bottom: 2rem;
     }