fix(core): npm run generate language is not properly created. (react-…

…boilerplate#1199) * rerun extract-intl * add default language to language provider
vinhkd · Nov 7, 2016 · ca6723f · ca6723f
1 parent 73659ac
commit ca6723f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/app/containers/LanguageProvider/reducer.js b/app/containers/LanguageProvider/reducer.js
@@ -8,9 +8,12 @@ import { fromJS } from 'immutable';
 import {
   CHANGE_LOCALE,
 } from './constants';
+import {
+  DEFAULT_LOCALE,
+} from '../App/constants';
 
 const initialState = fromJS({
-  locale: 'en',
+  locale: DEFAULT_LOCALE,
 });
 
 function languageProviderReducer(state = initialState, action) {

diff --git a/internals/generators/language/app-locale.hbs b/internals/generators/language/app-locale.hbs
@@ -1,2 +1 @@
-$1
-  '{{language}}',
+$1  '{{language}}',
diff --git a/internals/generators/language/index.js b/internals/generators/language/index.js
@@ -30,7 +30,7 @@ module.exports = {
     actions.push({
       type: 'modify',
       path: '../../app/i18n.js',
-      pattern: /([\n\s'[a-z]+',)(?!.*[\n\s'[a-z]+',)/g,
+      pattern: /(\s+'[a-z]+',\n)(?!.*\s+'[a-z]+',)/g,
       templateFile: './language/app-locale.hbs',
     });
     actions.push({

diff --git a/internals/templates/i18n.js b/internals/templates/i18n.js
@@ -5,7 +5,7 @@
  *
  */
 import { addLocaleData } from 'react-intl';
-import { DEFAULT_LOCALE } from 'containers/App/constants';
+import { DEFAULT_LOCALE } from './containers/App/constants'; // eslint-disable-line
 
 import enLocaleData from 'react-intl/locale-data/en';
 

diff --git a/internals/templates/languageProvider/constants.js b/internals/templates/languageProvider/constants.js
@@ -5,3 +5,4 @@
  */
 
 export const CHANGE_LOCALE = 'app/LanguageToggle/CHANGE_LOCALE';
+export const DEFAULT_LOCALE = 'en';
diff --git a/internals/templates/languageProvider/reducer.js b/internals/templates/languageProvider/reducer.js
@@ -8,9 +8,12 @@ import { fromJS } from 'immutable';
 import {
   CHANGE_LOCALE,
 } from './constants';
+import {
+  DEFAULT_LOCALE,
+} from '../App/constants'; // eslint-disable-line
 
 const initialState = fromJS({
-  locale: 'en',
+  locale: DEFAULT_LOCALE,
 });
 
 function languageProviderReducer(state = initialState, action) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		*/

		export const CHANGE_LOCALE = 'app/LanguageToggle/CHANGE_LOCALE';
		export const DEFAULT_LOCALE = 'en';