Merge branch 'master' into mu_js_page

apache · Jul 19, 2017 · 2133140 · 2133140
2 parents 0cd0139 + 6940bff
commit 2133140
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 0 deletions.
diff --git a/superset/assets/javascripts/explore/components/SaveModal.jsx b/superset/assets/javascripts/explore/components/SaveModal.jsx
@@ -33,8 +33,10 @@ class SaveModal extends React.Component {
     };
   }
   componentDidMount() {
+    this.loadLocales();
     this.props.actions.fetchDashboards(this.props.user_id);
   }
+
   onChange(name, event) {
     switch (name) {
       case 'newSliceName':
@@ -51,6 +53,17 @@ class SaveModal extends React.Component {
         break;
     }
   }
+
+  loadLocales() {
+    intl.init({
+      currentLocale: getLanguage(),
+      locales,
+    })
+    .then(() => {
+    this.setState({initDone: true});
+    });
+  }
+
   changeAction(action) {
     this.setState({ action });
   }

diff --git a/superset/assets/javascripts/explore/stores/en_US.js b/superset/assets/javascripts/explore/stores/en_US.js
@@ -0,0 +1,15 @@
+module.exports = {
+  enter_slice_name: 'Please enter a slice name',
+  select_dashboard: 'Please select a dashboard',
+  enter_dashboard_name: 'Please enter a dashboard name',
+  overwrite_slice: 'Overwrite slice',
+  slice_name: '[slice name]',
+  save_go_dash: 'Save & go to dashboard',
+  save_a_slice: 'Save A Slice',
+  add_to_new_dash: 'Add to new dashboard',
+  do_not_add_to_dash: 'Do not add to a dashboard',
+  add_slice_to_existing_dash: 'Add slice to existing dashboard',
+  save_as: 'Save as',
+  dash_name: 'Dashboard name',
+  save: 'Save',
+};
diff --git a/superset/assets/javascripts/explore/stores/language.js b/superset/assets/javascripts/explore/stores/language.js
@@ -22,3 +22,13 @@ export function getLanguage() {
       return 'es';
   }
 }
+
+export function getTranslate() {
+  const translate = $.ajax({
+    url: '/superset/rest/api/getTranslate',
+    async: false,
+  });
+  console.log(translate);
+  console.log(translate.responseText);
+  return translate.responseText;
+}
diff --git a/superset/assets/javascripts/explore/stores/zh_CN.js b/superset/assets/javascripts/explore/stores/zh_CN.js
@@ -0,0 +1,15 @@
+module.exports = {
+  enter_slice_name: '请输入切片名称',
+  select_dashboard: '请选择仪表盘',
+  enter_dashboard_name: '请输入仪表盘名称',
+  overwrite_slice: '覆盖切片',
+  slice_name: '[切片名称]',
+  save_go_dash: '保存并转到仪表盘',
+  save_a_slice: '保存一个切片',
+  add_to_new_dash: '添加到新的仪表盘',
+  do_not_add_to_dash: '不要添加到仪表盘',
+  add_slice_to_existing_dash: '将切片添加到现有仪表盘',
+  save_as: '另存为',
+  dash_name: '仪表盘名称',
+  save: '保存',
+};
diff --git a/superset/assets/package.json b/superset/assets/package.json
@@ -73,6 +73,8 @@
     "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",
     "react-resizable": "^1.3.3",