diff --git a/src/client/components/main_layout/TopBar.js b/src/client/components/main_layout/TopBar.js index 20f6d1a1b41ad94d1e2c45498dc3632733aa4dcc..0d4a16d71ce2e3ef76e46fe39af3d95371a8fd4d 100644 --- a/src/client/components/main_layout/TopBar.js +++ b/src/client/components/main_layout/TopBar.js @@ -156,14 +156,14 @@ class TopBar extends React.Component { component={this.AdapterLink} to={`/feedback`} > - FEEDBACK + {intl.get('topBar.feedback').toUpperCase()} </MenuItem> <MenuItem key={0} component={this.AdapterLink} to={`/about`} > - ABOUT THE PROJECT + {intl.get('topBar.info.aboutTheProject').toUpperCase()} </MenuItem> <a className={this.props.classes.link} key={1} @@ -172,7 +172,7 @@ class TopBar extends React.Component { rel='noopener noreferrer' > <MenuItem> - BLOG + {intl.get('topBar.info.blog').toUpperCase()} </MenuItem> </a> <MenuItem @@ -180,7 +180,7 @@ class TopBar extends React.Component { component={this.AdapterLink} to={`/instructions`} > - INSTRUCTIONS + {intl.get('topBar.instructions').toUpperCase()} </MenuItem> </Menu> @@ -196,7 +196,7 @@ class TopBar extends React.Component { to='/' > <Typography className={classes.title} variant="h6" color="inherit"> - MMM + {intl.get('topBar.appTitle')} </Typography> </Button> <TopBarSearchField @@ -214,7 +214,7 @@ class TopBar extends React.Component { isActive={(match, location) => location.pathname.startsWith(`/feedback`)} activeClassName={this.props.classes.appBarButtonActive} > - Feedback + {intl.get('topBar.feedback')} </Button> <TopBarInfoButton /> <Button @@ -224,7 +224,7 @@ class TopBar extends React.Component { isActive={(match, location) => location.pathname.startsWith(`/instructions`)} activeClassName={this.props.classes.appBarButtonActive} > - Instructions + {intl.get('topBar.instructions')} </Button> <TopBarLanguageButton currentLocale={currentLocale} diff --git a/src/client/components/main_layout/TopBarInfoButton.js b/src/client/components/main_layout/TopBarInfoButton.js index fd69728c25bf51c42e384756b2b93e1a11056d6d..2c801f689fe820e63b29696451e4e97aab675458 100644 --- a/src/client/components/main_layout/TopBarInfoButton.js +++ b/src/client/components/main_layout/TopBarInfoButton.js @@ -1,5 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; +import intl from 'react-intl-universal'; import Button from '@material-ui/core/Button'; import MenuItem from '@material-ui/core/MenuItem'; import Menu from '@material-ui/core/Menu'; @@ -74,7 +75,7 @@ class TopBarInfoButton extends React.Component { rel='noopener noreferrer' > <MenuItem onClick={this.handleInfoMenuClose}> - Blog + {intl.get('topBar.info.blog')} </MenuItem> </a> </Menu> diff --git a/src/client/reducers/options.js b/src/client/reducers/options.js index 6c4093016110520a454f790d2c2dd105c1eeeadb..b9c5fd248ceb4264f223a365c2a5c10bfffe1266 100644 --- a/src/client/reducers/options.js +++ b/src/client/reducers/options.js @@ -5,7 +5,7 @@ import { availableLocales } from '../epics/index.js'; let localeArray = []; for (const [key, value] of Object.entries(availableLocales)) { - localeArray.push({ id: key, label: value.label }); + localeArray.push({ id: key, label: value.languageLabel }); } export const INITIAL_STATE = { diff --git a/src/client/translations/localeEN.js b/src/client/translations/localeEN.js index b69d3b8f8905991678c5bcf6ef88920d4fbd9eee..c72b632a2a8946f4fc8380a3381b65627257694d 100644 --- a/src/client/translations/localeEN.js +++ b/src/client/translations/localeEN.js @@ -1,5 +1,14 @@ export default { - 'label': 'English', + 'languageLabel': 'English', + 'topBar': { + 'appTitle': 'MMM', + 'feedback': 'feedback', + 'info': { + 'blog': 'Blog', + 'aboutTheProject': 'About the project' + }, + 'instructions': 'instructions' + }, 'facetBar': { 'results': 'Results', 'narrowDownBy': 'Narrow down by' diff --git a/src/client/translations/localeFI.js b/src/client/translations/localeFI.js index e31e1d7243814b1e859638629ecaf00c58fa44ce..9f51dc68cedb1b19259610a0a1d7994e77a5bffc 100644 --- a/src/client/translations/localeFI.js +++ b/src/client/translations/localeFI.js @@ -1,18 +1,3 @@ export default { - 'label': 'Suomi', - 'facetBar': { - 'results': 'Tuloksia', - 'narrowDownBy': 'Rajaa' - }, - 'tabs': { - 'table': 'taulukko', - 'map': 'kartta', - 'production_places': 'tuotantopaikat', - 'migrations': 'migraatio', - 'export': 'lataa' - }, - 'table': { - 'rowsPerPage': 'Rows per page', - 'of': 'of' - }, + 'languageLabel': 'Suomi', }; diff --git a/src/client/translations/localeSV.js b/src/client/translations/localeSV.js index 2b012e3339479d131861e77d6aa5d6fb85bca4a1..cc2a8698d7503f333cdcc1867f0642f4392e2e20 100644 --- a/src/client/translations/localeSV.js +++ b/src/client/translations/localeSV.js @@ -1,6 +1,3 @@ export default { - 'label': 'Svenska', - 'facetBar': { - 'results': 'Resultat', - }, + 'languageLabel': 'Svenska', };