scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 08:31:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix pdf localization check

Browse source 
It was adding the `(English)` suffix no matter what. This fixes it by getting the locale from props, and also by making the conditional check a bit more safe.
This commit is contained in:
Matthew Taylor 2016-05-24 13:09:34 -04:00
parent 51e491bf44
commit ffc1e8d0ca
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/views/cards/cards.jsx
View file

@ -12,7 +12,7 @@ require('./cards.scss');
var Cards = injectIntl(React.createClass({
type: 'Cards',
render: function () {
var locale = window._locale || 'en';
var locale = this.props.intl.locale || 'en';
var formatMessage = this.props.intl.formatMessage;
var englishLinks = {
'cards.starterLink': '//scratch.mit.edu/scratchr2/static/pdfs/help/Scratch2Cards.pdf',
@ -52,7 +52,7 @@ var Cards = injectIntl(React.createClass({
<FormattedMessage id='cards.viewCard' />
{(
formattedLinks['cards.starterLink'] === englishLinks['cards.starterLink'] &&
locale !== 'en'
locale.indexOf('en') === -1
) ? [
<span> <FormattedMessage id='cards.english' /></span>
] : []}
@ -68,7 +68,7 @@ var Cards = injectIntl(React.createClass({
<FormattedMessage id='cards.viewCard' />
{(
formattedLinks['cards.nameLink'] === englishLinks['cards.nameLink'] &&
locale !== 'en'
locale.indexOf('en') === -1
) ? [
<span> (<FormattedMessage id='cards.english' />)</span>
] : []}
@ -84,7 +84,7 @@ var Cards = injectIntl(React.createClass({
<FormattedMessage id='cards.viewCard' />
{(
formattedLinks['cards.pongLink'] === englishLinks['cards.pongLink'] &&
locale !== 'en'
locale.indexOf('en') === -1
) ? [
<span> (<FormattedMessage id='cards.english' />)</span>
] : []}
@ -102,7 +102,7 @@ var Cards = injectIntl(React.createClass({
<FormattedMessage id='cards.viewCard' />
{(
formattedLinks['cards.storyLink'] === englishLinks['cards.storyLink'] &&
locale !== 'en'
locale.indexOf('en') === -1
) ? [
<span> (<FormattedMessage id='cards.english' />)</span>
] : []}
@ -118,7 +118,7 @@ var Cards = injectIntl(React.createClass({
<FormattedMessage id='cards.viewCard' />
{(
formattedLinks['cards.danceLink'] === englishLinks['cards.danceLink'] &&
locale !== 'en'
locale.indexOf('en') === -1
) ? [
<span> (<FormattedMessage id='cards.english' />)</span>
] : []}
@ -134,7 +134,7 @@ var Cards = injectIntl(React.createClass({
<FormattedMessage id='cards.viewCard' />
{(
formattedLinks['cards.hideLink'] === englishLinks['cards.hideLink'] &&
locale !== 'en'
locale.indexOf('en') === -1
) ? [
<span> (<FormattedMessage id='cards.english' />)</span>
] : []}