Merge pull request #2 from lxzhangchao/ch_react_page

Using react-intl-universal to improve multi language in react page
graceguo-supercat · Jul 7, 2017 · 551844a · 551844a
2 parents 5a4e13f + 7a01ac9
commit 551844a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/superset/assets/javascripts/explore/index.jsx b/superset/assets/javascripts/explore/index.jsx
@@ -42,9 +42,11 @@ const bootstrappedState = Object.assign(
     alert: null,
   },
 );
+
 const store = createStore(exploreReducer, bootstrappedState,
   compose(applyMiddleware(thunk), initEnhancer(false)),
 );
+
 ReactDOM.render(
   <Provider store={store}>
     <div>

diff --git a/superset/assets/javascripts/explore/stores/language.js b/superset/assets/javascripts/explore/stores/language.js
@@ -1,27 +1,6 @@
 
-import zh_CN from '../stores/zh_CN';
-import en_US from '../stores/en_US';
 const $ = window.$ = require('jquery'); // eslint-disable-line
 
-export function chooseMessage() {
-
-  function getLocale() {
-    const locale = $.ajax({
-      url: '/superset/rest/api/getLocale',
-      async: false,
-    });
-    return locale.responseText
-  }
-  switch (getLocale()) {
-    case 'en':
-      return en_US;
-    case 'zh':
-      return zh_CN;
-    default:
-      return en_US;
-  }
-}
-
 export function getLanguage() {
   function getLocale() {
     const locale = $.ajax({

diff --git a/superset/assets/package.json b/superset/assets/package.json
@@ -72,7 +72,6 @@
     "react-dom": "^15.5.1",
     "react-gravatar": "^2.6.1",
     "react-grid-layout": "^0.14.4",
-    "react-intl": "^2.3.0",
     "react-intl-universal": "^1.1.1",
     "react-map-gl": "^1.7.0",
     "react-redux": "^5.0.2",