删除无用 i18 相关代码

package.json

@@ -49,7 +49,7 @@
     "coveralls": "cat ./coverage/lcov/lcov.info | coveralls"
     "coveralls": "cat ./coverage/lcov/lcov.info | coveralls"
   },
   },
   "lint-staged": {
   "lint-staged": {
-    "*.js": "lint:eslint"
+    "*.jsx": "lint:eslint"
   },
   },
   "pre-commit": "lint:staged",
   "pre-commit": "lint:staged",
   "dllPlugin": {
   "dllPlugin": {

src/app.js

@@ -19,12 +19,8 @@ import { Provider } from 'react-redux';
 import { applyRouterMiddleware, Router, browserHistory } from 'react-router';
 import { applyRouterMiddleware, Router, browserHistory } from 'react-router';
 import { syncHistoryWithStore } from 'react-router-redux';
 import { syncHistoryWithStore } from 'react-router-redux';
 import { useScroll } from 'react-router-scroll';
 import { useScroll } from 'react-router-scroll';
-import LanguageProvider from 'containers/LanguageProvider';
 import configureStore from './store';
 import configureStore from './store';
 
 
-// Import i18n messages
-import { translationMessages } from './i18n';
-
 // Import the CSS reset, which HtmlWebpackPlugin transfers to the build folder
 // Import the CSS reset, which HtmlWebpackPlugin transfers to the build folder
 import 'sanitize.css/sanitize.css';
 import 'sanitize.css/sanitize.css';
 
 
@@ -39,6 +35,7 @@ const store = configureStore(initialState, browserHistory);
 // is under the non-default key ("routing"), selectLocationState
 // is under the non-default key ("routing"), selectLocationState
 // must be provided for resolving how to retrieve the "route" in the state
 // must be provided for resolving how to retrieve the "route" in the state
 import { selectLocationState } from 'containers/App/selectors';
 import { selectLocationState } from 'containers/App/selectors';
+
 const history = syncHistoryWithStore(browserHistory, store, {
 const history = syncHistoryWithStore(browserHistory, store, {
   selectLocationState: selectLocationState(),
   selectLocationState: selectLocationState(),
 });
 });
@@ -52,10 +49,9 @@ const rootRoute = {
 };
 };
 
 
 
 
-const render = (translatedMessages) => {
+const render = () => {
   ReactDOM.render(
   ReactDOM.render(
     <Provider store={store}>
     <Provider store={store}>
-      <LanguageProvider messages={translatedMessages}>
       <Router
       <Router
         history={history}
         history={history}
         routes={rootRoute}
         routes={rootRoute}
@@ -65,42 +61,15 @@ const render = (translatedMessages) => {
           applyRouterMiddleware(useScroll())
           applyRouterMiddleware(useScroll())
         }
         }
       />
       />
-      </LanguageProvider>
     </Provider>,
     </Provider>,
     document.getElementById('app')
     document.getElementById('app')
   );
   );
 };
 };
 
 
-
-// Hot reloadable translation json files
-if (module.hot) {
-  // modules.hot.accept does not accept dynamic dependencies,
-  // have to be constants at compile-time
-  module.hot.accept('./i18n', () => {
-    render(translationMessages);
-  });
-}
-
-// Chunked polyfill for browsers without Intl support
-if (!window.Intl) {
-  (new Promise((resolve) => {
-    resolve(System.import('intl'));
-  }))
-    .then(() => Promise.all([
-      System.import('intl/locale-data/jsonp/de.js'),
-    ]))
-    .then(() => render(translationMessages))
-    .catch((err) => {
-      throw err;
-    });
-} else {
-  render(translationMessages);
-}
+render();
 
 
 // Install ServiceWorker and AppCache in the end since
 // Install ServiceWorker and AppCache in the end since
 // it's not most important operation and if main code fails,
 // it's not most important operation and if main code fails,
 // we do not want it installed
 // we do not want it installed
 import { install } from 'offline-plugin/runtime';
 import { install } from 'offline-plugin/runtime';
 install();
 install();
-
-System.import('main.js');

src/containers/HomePage/index.js

@@ -9,15 +9,17 @@
  * the linting exception.
  * the linting exception.
  */
  */
 
 
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import messages from './messages';
+import React, { PureComponent } from 'react';
+
+export default class HomePage extends PureComponent { // eslint-disable-line react/prefer-stateless-function
+  constructor(props) {
+    super(props);
+  }
 
 
-export default class HomePage extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
   render() {
   render() {
     return (
     return (
       <h1>
       <h1>
-        <FormattedMessage {...messages.header} />
+        This is HomePage components !
       </h1>
       </h1>
     );
     );
   }
   }

src/containers/HomePage/messages.js

-/*
- * HomePage Messages
- *
- * This contains all the text for the HomePage component.
- */
-import { defineMessages } from 'react-intl';
-
-export default defineMessages({
-  header: {
-    id: 'app.components.HomePage.header',
-    defaultMessage: 'This is HomePage components !',
-  },
-});

src/containers/LanguageProvider/actions.js

-/*
- *
- * LanguageProvider actions
- *
- */
-
-import {
-  CHANGE_LOCALE,
-} from './constants';
-
-export function changeLocale(languageLocale) {
-  return {
-    type: CHANGE_LOCALE,
-    locale: languageLocale,
-  };
-}

src/containers/LanguageProvider/constants.js

-/*
- *
- * LanguageProvider constants
- *
- */
-
-export const CHANGE_LOCALE = 'app/LanguageToggle/CHANGE_LOCALE';
-export const DEFAULT_LOCALE = 'en';

src/containers/LanguageProvider/index.js

-/*
- *
- * LanguageProvider
- *
- * this component connects the redux state language locale to the
- * IntlProvider component and i18n messages (loaded from `app/translations`)
- */
-
-import React from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { IntlProvider } from 'react-intl';
-import { selectLocale } from './selectors';
-
-export class LanguageProvider extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
-  render() {
-    return (
-      <IntlProvider locale={this.props.locale} key={this.props.locale} messages={this.props.messages[this.props.locale]}>
-        {React.Children.only(this.props.children)}
-      </IntlProvider>
-    );
-  }
-}
-
-LanguageProvider.propTypes = {
-  locale: React.PropTypes.string,
-  messages: React.PropTypes.object,
-  children: React.PropTypes.element.isRequired,
-};
-
-
-const mapStateToProps = createSelector(
-  selectLocale(),
-  (locale) => ({ locale })
-);
-
-function mapDispatchToProps(dispatch) {
-  return {
-    dispatch,
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(LanguageProvider);

src/containers/LanguageProvider/reducer.js

-/*
- *
- * LanguageProvider reducer
- *
- */
-
-import { fromJS } from 'immutable';
-import {
-  CHANGE_LOCALE,
-} from './constants';
-import {
-  DEFAULT_LOCALE,
-} from '../App/constants'; // eslint-disable-line
-
-const initialState = fromJS({
-  locale: DEFAULT_LOCALE,
-});
-
-function languageProviderReducer(state = initialState, action) {
-  switch (action.type) {
-    case CHANGE_LOCALE:
-      return state
-        .set('locale', action.locale);
-    default:
-      return state;
-  }
-}
-
-export default languageProviderReducer;

src/containers/LanguageProvider/selectors.js

-import { createSelector } from 'reselect';
-
-/**
- * Direct selector to the languageToggle state domain
- */
-const selectLanguage = () => (state) => state.get('language');
-
-/**
- * Select the language locale
- */
-
-const selectLocale = () => createSelector(
-  selectLanguage(),
-  (languageState) => languageState.get('locale')
-);
-
-export {
-  selectLanguage,
-  selectLocale,
-};

src/containers/NotFoundPage/index.js

-/**
- * NotFoundPage
- *
- * This is the page we show when the user visits a url that doesn't have a route
- *
- * NOTE: while this component should technically be a stateless functional
- * component (SFC), hot reloading does not currently support SFCs. If hot
- * reloading is not a necessity for you then you can refactor it and remove
- * the linting exception.
- */
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import messages from './messages';
-
-export default class NotFound extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
-  render() {
-    return (
-      <h1>
-        <FormattedMessage {...messages.header} />
-      </h1>
-    );
-  }
-}

src/containers/NotFoundPage/messages.js

-/*
- * NotFoundPage Messages
- *
- * This contains all the text for the NotFoundPage component.
- */
-import { defineMessages } from 'react-intl';
-
-export default defineMessages({
-  header: {
-    id: 'app.components.NotFoundPage.header',
-    defaultMessage: 'This is NotFoundPage component !',
-  },
-});

src/i18n.js

-/**
- * i18n.js
- *
- * This will setup the i18n language files and locale data for your app.
- *
- */
-import { addLocaleData } from 'react-intl';
-import { DEFAULT_LOCALE } from './containers/App/constants'; // eslint-disable-line
-
-import enLocaleData from 'react-intl/locale-data/en';
-
-export const appLocales = [
-  'en',
-];
-
-import enTranslationMessages from './translations/en.json';
-
-addLocaleData(enLocaleData);
-
-export const formatTranslationMessages = (locale, messages) => {
-  const defaultFormattedMessages = locale !== DEFAULT_LOCALE ? formatTranslationMessages(DEFAULT_LOCALE, enTranslationMessages) : {};
-  const formattedMessages = {};
-  const messageKeys = Object.keys(messages);
-  for (const messageKey of messageKeys) {
-    if (locale === DEFAULT_LOCALE) {
-      formattedMessages[messageKey] = messages[messageKey];
-    } else {
-      formattedMessages[messageKey] = messages[messageKey] || defaultFormattedMessages[messageKey];
-    }
-  }
-
-  return formattedMessages;
-};
-
-export const translationMessages = {
-  en: formatTranslationMessages('en', enTranslationMessages),
-};

src/main.js

-import React, { Component } from 'react';
-
-export default class TestPage extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {};
-  }
-
-  render() {
-    return (<p>Hello World!</p>);
-  }
-}

src/reducers.js

@@ -6,7 +6,6 @@
 import { combineReducers } from 'redux-immutable';
 import { combineReducers } from 'redux-immutable';
 import { fromJS } from 'immutable';
 import { fromJS } from 'immutable';
 import { LOCATION_CHANGE } from 'react-router-redux';
 import { LOCATION_CHANGE } from 'react-router-redux';
-import languageProviderReducer from 'containers/LanguageProvider/reducer';
 
 
 /*
 /*
  * routeReducer
  * routeReducer
@@ -42,7 +41,6 @@ function routeReducer(state = routeInitialState, action) {
 export default function createReducer(asyncReducers) {
 export default function createReducer(asyncReducers) {
   return combineReducers({
   return combineReducers({
     route: routeReducer,
     route: routeReducer,
-    language: languageProviderReducer,
     ...asyncReducers,
     ...asyncReducers,
   });
   });
 }
 }

src/routes.js

@@ -33,14 +33,6 @@ export default function createRoutes(store) {
 
 
         importModules.catch(errorLoading);
         importModules.catch(errorLoading);
       },
       },
-    }, {
-      path: '*',
-      name: 'notfound',
-      getComponent(nextState, cb) {
-        System.import('containers/NotFoundPage')
-          .then(loadModule(cb))
-          .catch(errorLoading);
-      },
-    },
+    }
   ];
   ];
 }
 }