Skip to content

GitLab

S
scratch-www
Unverified Commit 14de9514 authored by Sarah Otts's avatar Sarah Otts Committed by GitHub
Browse files
Options

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

Remove use of FormattedHTMLMessage in Annual Report
parents eaaee5db 1aa59eda
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
src/views/annual-report/annual-report.jsx
View file @ 14de9514
...@@ -2,7 +2,6 @@ const bindAll = require('lodash.bindall'); ...@@ -2,7 +2,6 @@ const bindAll = require('lodash.bindall');
const classNames = require('classnames'); const classNames = require('classnames');
const React = require('react'); const React = require('react');
const MediaQuery = require('react-responsive').default; const MediaQuery = require('react-responsive').default;
const FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
const FormattedMessage = require('react-intl').FormattedMessage; const FormattedMessage = require('react-intl').FormattedMessage;
const injectIntl = require('react-intl').injectIntl; const injectIntl = require('react-intl').injectIntl;
const intlShape = require('react-intl').intlShape; const intlShape = require('react-intl').intlShape;
...@@ -1994,11 +1993,11 @@ class AnnualReport extends React.Component { ...@@ -1994,11 +1993,11 @@ class AnnualReport extends React.Component {
<FormattedMessage id="annualReport.supportersTitle" /> <FormattedMessage id="annualReport.supportersTitle" />
</h2> </h2>
<p> <p>
<FormattedHTMLMessage id="annualReport.supportersIntro" /> <FormattedMessage id="annualReport.supportersIntro" />
</p> </p>
</div> </div>
<div className="subsection-tag"> <div className="subsection-tag">
<FormattedHTMLMessage id="annualReport.supportersSpotlightTitle" /> <FormattedMessage id="annualReport.supportersSpotlightTitle" />
</div> </div>
<div className="supporters-subsection"> <div className="supporters-subsection">
<div className="supporters-blurb"> <div className="supporters-blurb">
...@@ -2033,53 +2032,53 @@ class AnnualReport extends React.Component { ...@@ -2033,53 +2032,53 @@ class AnnualReport extends React.Component {
<div className="supporters-subsection supporters-lists"> <div className="supporters-subsection supporters-lists">
<div className="supporters-blurb"> <div className="supporters-blurb">
<h4> <h4>
<FormattedHTMLMessage id="annualReport.supportersThankYou" /> <FormattedMessage id="annualReport.supportersThankYou" />
</h4> </h4>
<p> <p>
<FormattedHTMLMessage id="annualReport.supportersAllDescription" /> <FormattedMessage id="annualReport.supportersAllDescription" />
</p> </p>
<p className="founding-partners-blurb"> <p className="founding-partners-blurb">
<FormattedHTMLMessage id="annualReport.supportersFoundingDescription" /> <FormattedMessage id="annualReport.supportersFoundingDescription" />
</p> </p>
</div> </div>
<div className="supporters-level"> <div className="supporters-level">
<h5> <h5>
<FormattedHTMLMessage id="annualReport.supportersFoundingTitle" /> <FormattedMessage id="annualReport.supportersFoundingTitle" />
</h5> </h5>
<hr /> <hr />
{createSupportersLists(Supporters.founding)} {createSupportersLists(Supporters.founding)}
</div> </div>
<div className="supporters-level"> <div className="supporters-level">
<h5> <h5>
<FormattedHTMLMessage id="annualReport.supportersCreativityTitle" /> <FormattedMessage id="annualReport.supportersCreativityTitle" />
</h5> </h5>
<hr /> <hr />
{createSupportersLists(Supporters.creativity)} {createSupportersLists(Supporters.creativity)}
</div> </div>
<div className="supporters-level"> <div className="supporters-level">
<h5> <h5>
<FormattedHTMLMessage id="annualReport.supportersCollaborationTitle" /> <FormattedMessage id="annualReport.supportersCollaborationTitle" />
</h5> </h5>
<hr /> <hr />
{createSupportersLists(Supporters.collaboration)} {createSupportersLists(Supporters.collaboration)}
</div> </div>
<div className="supporters-level"> <div className="supporters-level">
<h5> <h5>
<FormattedHTMLMessage id="annualReport.supportersImaginationTitle" /> <FormattedMessage id="annualReport.supportersImaginationTitle" />
</h5> </h5>
<hr /> <hr />
{createSupportersLists(Supporters.imagination)} {createSupportersLists(Supporters.imagination)}
</div> </div>
<div className="supporters-level"> <div className="supporters-level">
<h5> <h5>
<FormattedHTMLMessage id="annualReport.supportersInspirationTitle" /> <FormattedMessage id="annualReport.supportersInspirationTitle" />
</h5> </h5>
<hr /> <hr />
{createSupportersLists(Supporters.inspiration)} {createSupportersLists(Supporters.inspiration)}
</div> </div>
<div className="supporters-level"> <div className="supporters-level">
<h5> <h5>
<FormattedHTMLMessage id="annualReport.supportersExplorationTitle" /> <FormattedMessage id="annualReport.supportersExplorationTitle" />
</h5> </h5>
<hr /> <hr />
{createSupportersLists(Supporters.exploration)} {createSupportersLists(Supporters.exploration)}
...@@ -2088,7 +2087,7 @@ class AnnualReport extends React.Component { ...@@ -2088,7 +2087,7 @@ class AnnualReport extends React.Component {
<div className="supporters-subsection supporters-lists"> <div className="supporters-subsection supporters-lists">
<div className="supporters-level"> <div className="supporters-level">
<h3> <h3>
<FormattedHTMLMessage id="annualReport.supportersInKindTitle" /> <FormattedMessage id="annualReport.supportersInKindTitle" />
</h3> </h3>
{createSupportersLists(Supporters.inKind)} {createSupportersLists(Supporters.inKind)}
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment