@capillarytech/creatives-library 7.17.28 → 7.17.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/v2Containers/LanguageProvider/index.js +2 -2
- package/v2Containers/LanguageProvider/reducer.js +3 -2
- package/v2Containers/LanguageProvider/sagas.js +1 -0
- package/v2Containers/LanguageProvider/selectors.js +2 -1
- package/v2Containers/LanguageProvider/tests/reducer.test.js +6 -3
package/package.json
CHANGED
|
@@ -53,7 +53,7 @@ export class LanguageProvider extends React.PureComponent { // eslint-disable-li
|
|
|
53
53
|
this.props.actions.getLocizMessage(locale);
|
|
54
54
|
}
|
|
55
55
|
render() {
|
|
56
|
-
const { locale, messages} = this.props.language;
|
|
56
|
+
const { locale, messages, languageLocale} = this.props.language;
|
|
57
57
|
const mappedLocale = {
|
|
58
58
|
'en': enUS,
|
|
59
59
|
'zh-cn': zhCN,
|
|
@@ -65,7 +65,7 @@ export class LanguageProvider extends React.PureComponent { // eslint-disable-li
|
|
|
65
65
|
const file = mappedLocale[jLocale];
|
|
66
66
|
return (
|
|
67
67
|
<ConfigProvider locale={file}>
|
|
68
|
-
<IntlProvider locale={
|
|
68
|
+
<IntlProvider locale={languageLocale} key={locale} messages={messages}>
|
|
69
69
|
{React.Children.only(this.props.children)}
|
|
70
70
|
</IntlProvider>
|
|
71
71
|
</ConfigProvider>
|
|
@@ -10,6 +10,7 @@ import * as types from './constants';
|
|
|
10
10
|
|
|
11
11
|
const initialState = fromJS({
|
|
12
12
|
locale: types.DEFAULT_LOCALE,
|
|
13
|
+
languageLocale: types.DEFAULT_LOCALE,
|
|
13
14
|
messages: {},
|
|
14
15
|
localeLoading: false,
|
|
15
16
|
});
|
|
@@ -18,11 +19,11 @@ function languageProviderReducer(state = initialState, action) {
|
|
|
18
19
|
switch (action.type) {
|
|
19
20
|
case types.GET_LOCIZ_MESSAGE_REQUEST:
|
|
20
21
|
return state
|
|
21
|
-
.set('localeLoading', true)
|
|
22
|
-
.set('locale', action.locale);
|
|
22
|
+
.set('localeLoading', true);
|
|
23
23
|
case types.GET_LOCIZ_MESSAGE_SUCCESS:
|
|
24
24
|
return state
|
|
25
25
|
.set('localeLoading', false)
|
|
26
|
+
.set('languageLocale', action.locale)
|
|
26
27
|
.set('messages', fromJS(action.data));
|
|
27
28
|
case types.GET_LOCIZ_MESSAGE_FAILURE:
|
|
28
29
|
return state.set('localeLoading', false);
|
|
@@ -10,22 +10,25 @@ describe('languageProviderReducer', () => {
|
|
|
10
10
|
it('returns the initial state', () => {
|
|
11
11
|
expect(languageProviderReducer(undefined, {})).toEqual(fromJS({
|
|
12
12
|
locale: 'en',
|
|
13
|
+
languageLocale: 'en',
|
|
13
14
|
messages: {},
|
|
14
15
|
localeLoading: false,
|
|
15
16
|
}));
|
|
16
17
|
});
|
|
17
18
|
|
|
18
19
|
it('changes the locale', () => {
|
|
19
|
-
expect(languageProviderReducer(undefined, { type: CHANGE_LOCALE, locale: '
|
|
20
|
+
expect(languageProviderReducer(undefined, { type: CHANGE_LOCALE, locale: 'en', languageLocale: 'en' }).toJS()).toEqual({
|
|
20
21
|
locale: "en",
|
|
22
|
+
languageLocale: "en",
|
|
21
23
|
localeLoading: false,
|
|
22
24
|
messages: {},
|
|
23
25
|
});
|
|
24
26
|
});
|
|
25
27
|
|
|
26
28
|
it('make locize message request', () => {
|
|
27
|
-
expect(languageProviderReducer(undefined, { type: GET_LOCIZ_MESSAGE_REQUEST, locale: '
|
|
28
|
-
locale: "
|
|
29
|
+
expect(languageProviderReducer(undefined, { type: GET_LOCIZ_MESSAGE_REQUEST, locale: 'en', languageLocale: 'en' }).toJS()).toEqual({
|
|
30
|
+
locale: "en",
|
|
31
|
+
languageLocale: 'en',
|
|
29
32
|
localeLoading: true,
|
|
30
33
|
messages: {},
|
|
31
34
|
});
|