Merge pull request #4121 from apple502j/wiki-link

Set wiki link per user's selected language
This commit is contained in:
Benjamin Wheeler 2020-07-09 14:20:28 -04:00 committed by GitHub
commit 21ccd45f9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 3 deletions

View file

@ -2,12 +2,15 @@ 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;
const MediaQuery = require('react-responsive').default; const MediaQuery = require('react-responsive').default;
const connect = require('react-redux').connect;
const PropTypes = require('prop-types');
const React = require('react'); const React = require('react');
const FooterBox = require('../container/footer.jsx'); const FooterBox = require('../container/footer.jsx');
const LanguageChooser = require('../../languagechooser/languagechooser.jsx'); const LanguageChooser = require('../../languagechooser/languagechooser.jsx');
const frameless = require('../../../lib/frameless'); const frameless = require('../../../lib/frameless');
const getScratchWikiLink = require('../../../lib/scratch-wiki');
require('./footer.scss'); require('./footer.scss');
@ -108,7 +111,7 @@ const Footer = props => (
</a> </a>
</dd> </dd>
<dd> <dd>
<a href="https://en.scratch-wiki.info/"> <a href={props.scratchWikiLink}>
<FormattedMessage id="general.wiki" /> <FormattedMessage id="general.wiki" />
</a> </a>
</dd> </dd>
@ -213,7 +216,13 @@ const Footer = props => (
); );
Footer.propTypes = { Footer.propTypes = {
intl: intlShape.isRequired intl: intlShape.isRequired,
scratchWikiLink: PropTypes.string
}; };
module.exports = injectIntl(Footer); const mapStateToProps = (state, ownProps) => ({
scratchWikiLink: getScratchWikiLink(ownProps.intl.locale)
});
const ConnectedFooter = connect(mapStateToProps)(Footer);
module.exports = injectIntl(ConnectedFooter);

24
src/lib/scratch-wiki.js Normal file
View file

@ -0,0 +1,24 @@
// This list has to be updated when a new Scratch Wiki is made.
// Note that wikis under testwiki are not included.
const wwwLocaleToScratchWikiLocale = {
en: 'en',
ja: 'ja',
fr: 'fr',
de: 'de',
ru: 'ru',
hu: 'hu',
nl: 'nl',
id: 'id'
};
const getScratchWikiLink = locale => {
if (!wwwLocaleToScratchWikiLocale.hasOwnProperty(locale)) {
locale = locale.split('-')[0];
if (!wwwLocaleToScratchWikiLocale.hasOwnProperty(locale)) {
locale = 'en';
}
}
return `https://${wwwLocaleToScratchWikiLocale[locale]}.scratch-wiki.info/`;
};
module.exports = getScratchWikiLink;

View file

@ -0,0 +1,19 @@
const getScratchWikiLink = require('../../../src/lib/scratch-wiki');
describe('unit test lib/scratch-wiki.js', () => {
test('getScratchWikiLink exists', () => {
expect(typeof getScratchWikiLink).toBe('function');
});
test('it returns link to jawiki when ja is given', () => {
expect(getScratchWikiLink('ja')).toBe('https://ja.scratch-wiki.info/');
});
test('it returns link to jawiki when ja-Hira is given', () => {
expect(getScratchWikiLink('ja-Hira')).toBe('https://ja.scratch-wiki.info/');
});
test('it returns link to enwiki when invalid locale is given', () => {
expect(getScratchWikiLink('test')).toBe('https://en.scratch-wiki.info/');
});
});