Skip to content
Snippets Groups Projects
Unverified Commit ffddd1b0 authored by Anton Georgiev's avatar Anton Georgiev Committed by GitHub
Browse files

Merge pull request #12891 from ramonlsouza/issue-12687

fix: override default locale api parameter
parents 0c999a69 57d5ee87
No related branches found
No related tags found
No related merge requests found
......@@ -10,6 +10,7 @@ import { Session } from 'meteor/session';
const propTypes = {
locale: PropTypes.string,
overrideLocaleFromPassedParameter: PropTypes.string,
children: PropTypes.element.isRequired,
};
......@@ -20,6 +21,7 @@ const LARGE_FONT_LANGUAGES = ['te', 'km'];
const defaultProps = {
locale: DEFAULT_LANGUAGE,
overrideLocaleFromPassedParameter: null,
};
class IntlStartup extends Component {
......@@ -60,9 +62,14 @@ class IntlStartup extends Component {
componentDidUpdate(prevProps) {
const { fetching, messages, normalizedLocale } = this.state;
const { locale } = this.props;
const shouldFetch = (!fetching && _.isEmpty(messages)) || ((locale !== prevProps.locale) && (normalizedLocale && (locale !== normalizedLocale)));
if (shouldFetch) this.fetchLocalizedMessages(locale);
const { locale, overrideLocaleFromPassedParameter } = this.props;
if (overrideLocaleFromPassedParameter !== prevProps.overrideLocaleFromPassedParameter) {
this.fetchLocalizedMessages(overrideLocaleFromPassedParameter);
} else {
const shouldFetch = (!fetching && _.isEmpty(messages)) || ((locale !== prevProps.locale) && (normalizedLocale && (locale !== normalizedLocale)));
if (shouldFetch) this.fetchLocalizedMessages(locale);
}
}
fetchLocalizedMessages(locale, init = false) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment