From 7a01ac99589afd723df293dc64019214515604b4 Mon Sep 17 00:00:00 2001 From: lxzhangchao <1099326813@qq.com> Date: Fri, 7 Jul 2017 17:35:48 +0800 Subject: [PATCH] react_intl_universal --- superset/assets/javascripts/explore/index.jsx | 2 ++ .../javascripts/explore/stores/language.js | 21 ------------------- superset/assets/package.json | 1 - 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/superset/assets/javascripts/explore/index.jsx b/superset/assets/javascripts/explore/index.jsx index ed4eeb0705005..39ecab08c57dd 100644 --- 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(
diff --git a/superset/assets/javascripts/explore/stores/language.js b/superset/assets/javascripts/explore/stores/language.js index 24aa36c43aba1..e17179a963b48 100644 --- 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 index be49674af7435..218a5e11cffaf 100644 --- 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",