scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 17:45:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4832 from seotts/annual-report-formattedmessage

Browse source 
Remove use of FormattedHTMLMessage in Annual Report
This commit is contained in:
Sarah Otts 2021-01-08 15:27:53 -05:00 committed by GitHub
commit 14de951497
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/views/annual-report/annual-report.jsx
View file

@ -2,7 +2,6 @@ const bindAll = require('lodash.bindall');
const classNames = require('classnames');
const React = require('react');
const MediaQuery = require('react-responsive').default;
const FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
const FormattedMessage = require('react-intl').FormattedMessage;
const injectIntl = require('react-intl').injectIntl;
const intlShape = require('react-intl').intlShape;
@ -1994,11 +1993,11 @@ class AnnualReport extends React.Component {
<FormattedMessage id="annualReport.supportersTitle" />
</h2>
<p>
<FormattedHTMLMessage id="annualReport.supportersIntro" />
<FormattedMessage id="annualReport.supportersIntro" />
</p>
</div>
<div className="subsection-tag">
<FormattedHTMLMessage id="annualReport.supportersSpotlightTitle" />
<FormattedMessage id="annualReport.supportersSpotlightTitle" />
</div>
<div className="supporters-subsection">
<div className="supporters-blurb">
@ -2033,53 +2032,53 @@ class AnnualReport extends React.Component {
<div className="supporters-subsection supporters-lists">
<div className="supporters-blurb">
<h4>
<FormattedHTMLMessage id="annualReport.supportersThankYou" />
<FormattedMessage id="annualReport.supportersThankYou" />
</h4>
<p>
<FormattedHTMLMessage id="annualReport.supportersAllDescription" />
<FormattedMessage id="annualReport.supportersAllDescription" />
</p>
<p className="founding-partners-blurb">
<FormattedHTMLMessage id="annualReport.supportersFoundingDescription" />
<FormattedMessage id="annualReport.supportersFoundingDescription" />
</p>
</div>
<div className="supporters-level">
<h5>
<FormattedHTMLMessage id="annualReport.supportersFoundingTitle" />
<FormattedMessage id="annualReport.supportersFoundingTitle" />
</h5>
<hr />
{createSupportersLists(Supporters.founding)}
</div>
<div className="supporters-level">
<h5>
<FormattedHTMLMessage id="annualReport.supportersCreativityTitle" />
<FormattedMessage id="annualReport.supportersCreativityTitle" />
</h5>
<hr />
{createSupportersLists(Supporters.creativity)}
</div>
<div className="supporters-level">
<h5>
<FormattedHTMLMessage id="annualReport.supportersCollaborationTitle" />
<FormattedMessage id="annualReport.supportersCollaborationTitle" />
</h5>
<hr />
{createSupportersLists(Supporters.collaboration)}
</div>
<div className="supporters-level">
<h5>
<FormattedHTMLMessage id="annualReport.supportersImaginationTitle" />
<FormattedMessage id="annualReport.supportersImaginationTitle" />
</h5>
<hr />
{createSupportersLists(Supporters.imagination)}
</div>
<div className="supporters-level">
<h5>
<FormattedHTMLMessage id="annualReport.supportersInspirationTitle" />
<FormattedMessage id="annualReport.supportersInspirationTitle" />
</h5>
<hr />
{createSupportersLists(Supporters.inspiration)}
</div>
<div className="supporters-level">
<h5>
<FormattedHTMLMessage id="annualReport.supportersExplorationTitle" />
<FormattedMessage id="annualReport.supportersExplorationTitle" />
</h5>
<hr />
{createSupportersLists(Supporters.exploration)}
@ -2088,7 +2087,7 @@ class AnnualReport extends React.Component {
<div className="supporters-subsection supporters-lists">
<div className="supporters-level">
<h3>
<FormattedHTMLMessage id="annualReport.supportersInKindTitle" />
<FormattedMessage id="annualReport.supportersInKindTitle" />
</h3>
{createSupportersLists(Supporters.inKind)}
</div>