[translate]Translate the po file into chinese

CONTRIBUTING.md

@@ -49,6 +49,10 @@ If you are proposing a feature:
     implement.
 -   Remember that this is a volunteer-driven project, and that
     contributions are welcome :)
+
+### Questions
+
+There is a dedicated [tag](https://stackoverflow.com/questions/tagged/apache-superset) on [stackoverflow](https://stackoverflow.com/). Please use it when asking questions.
 
 ## Pull Request Guidelines
 
@@ -351,14 +355,15 @@ navigation bar.
     }
 
 As per the [Flask AppBuilder documentation] about translation, to create a
-new language dictionary, run the following command:
+new language dictionary, run the following command (where `es` is replaced with
+the language code for your target language):
 
-    pybabel init -i ./babel/messages.pot -d superset/translations -l es
+    pybabel init -i superset/translations/messages.pot -d superset/translations -l es
 
 Then it's a matter of running the statement below to gather all strings that
 need translation
 
-    fabmanager babel-extract --target superset/translations/ -k _ -k __ -k t -k tn -k tct
+    fabmanager babel-extract --target superset/translations/ --output superset/translations/messages.pot --config superset/translations/babel.cfg -k _ -k __ -k t -k tn -k tct
 
 You can then translate the strings gathered in files located under
 `superset/translation`, where there's one per language. For the translations
@@ -375,6 +380,11 @@ Execute this command to convert the en PO file into a json file:
 
     po2json -d superset -f jed1.x superset/translations/en/LC_MESSAGES/messages.po superset/translations/en/LC_MESSAGES/messages.json
 
+If you get errors running `po2json`, you might be running the ubuntu package with the same
+name rather than the nodejs package (they have a different format for the arguments). You
+need to be running the nodejs version, and so if there is a conflict you may need to point
+directly at `/usr/local/bin/po2json` rather than just `po2json`.
+
 ## Adding new datasources
 
 1. Create Models and Views for the datasource, add them under superset folder, like a new my_models.py

MANIFEST.in

@@ -1,8 +1,9 @@
-recursive-include superset/templates *
+recursive-include superset/data *
+recursive-include superset/migrations *
 recursive-include superset/static *
 recursive-exclude superset/static/docs *
 recursive-exclude superset/static/spec *
 recursive-exclude superset/static/assets/node_modules *
+recursive-include superset/templates *
+recursive-include superset/translations *
 recursive-exclude tests *
-recursive-include superset/data *
-recursive-include superset/migrations *

README.md

@@ -153,6 +153,7 @@ Resources
 * [Gitter (live chat) Channel](https://gitter.im/airbnb/superset)
 * [Docker image](https://hub.docker.com/r/amancevice/superset/) (community contributed)
 * [Slides from Strata (March 2016)](https://drive.google.com/open?id=0B5PVE0gzO81oOVJkdF9aNkJMSmM)
+* [Stackoverflow tag](https://stackoverflow.com/questions/tagged/apache-superset)
 
 
 Contributing

docs/_build/html/README.md

@@ -0,0 +1 @@
+Folder containing the sphinx-generated documentation

docs/faq.rst

@@ -170,8 +170,8 @@ You can override this path using the ``SUPERSET_HOME`` environment variable.
 
 Another work around is to change where superset stores the sqlite database by adding ``SQLALCHEMY_DATABASE_URI = 'sqlite:////new/location/superset.db'`` in superset_config.py (create the file if needed), then adding the directory where superset_config.py lives to PYTHONPATH environment variable (e.g. ``export PYTHONPATH=/opt/logs/sandbox/airbnb/``).
 
-How do I add new columns to an existing table
----------------------------------------------
+What if the table schema changed?
+---------------------------------
 
 Table schemas evolve, and Superset needs to reflect that. It's pretty common
 in the life cycle of a dashboard to want to add a new dimension or metric.
@@ -213,3 +213,11 @@ How can I set a default filter on my dashboard?
 
 Easy. Simply apply the filter and save the dashboard while the filter
 is active.
+
+How do I get Superset to refresh the schema of my table?
+--------------------------------------------------------
+
+When adding columns to a table, you can have Superset detect and merge the
+new columns in by using the "Refresh Metadata" action in the
+``Source -> Tables`` page. Simply check the box next to the tables
+you want the schema refreshed, and click ``Actions -> Refresh Metadata``.

docs/installation.rst

@@ -62,7 +62,7 @@ that the required dependencies are installed: ::
 **OSX**, system python is not recommended. brew's python also ships with pip  ::
 
     brew install pkg-config libffi openssl python
-    env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include" pip install cryptography==1.7.2
+    env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include" pip install cryptography==1.9
 
 **Windows** isn't officially supported at this point, but if you want to
 attempt it, download `get-pip.py <https://bootstrap.pypa.io/get-pip.py>`_, and run ``python get-pip.py`` which may need admin access. Then run the following: ::

superset/assets/.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets" : ["airbnb", "env", "react"],
+  "presets" : ["airbnb"],
 }

superset/assets/javascripts/SqlLab/components/RunQueryActionButton.jsx

@@ -19,7 +19,6 @@ export default function RunQueryActionButton(props) {
   const runBtnText = props.selectedText ? t('Run Selected Query') : t('Run Query');
   const btnStyle = props.selectedText ? 'warning' : 'primary';
   const shouldShowStopBtn = ['running', 'pending'].indexOf(props.queryState) > -1;
-  const asyncToolTip = t('Run query asynchronously');
 
   const commonBtnProps = {
     bsSize: 'small',
@@ -32,7 +31,7 @@ export default function RunQueryActionButton(props) {
       {...commonBtnProps}
       onClick={() => props.runQuery(false)}
       key="run-btn"
-      tooltip={asyncToolTip}
+      tooltip={t('Run query synchronously')}
     >
       <i className="fa fa-refresh" /> {runBtnText}
     </Button>
@@ -43,7 +42,7 @@ export default function RunQueryActionButton(props) {
       {...commonBtnProps}
       onClick={() => props.runQuery(true)}
       key="run-async-btn"
-      tooltip={asyncToolTip}
+      tooltip={t('Run query asynchronously')}
     >
       <i className="fa fa-table" /> {runBtnText}
     </Button>

superset/assets/javascripts/components/MetricOption.jsx

@@ -5,16 +5,17 @@ import InfoTooltipWithTrigger from './InfoTooltipWithTrigger';
 
 const propTypes = {
   metric: PropTypes.object.isRequired,
+  openInNewWindow: PropTypes.bool,
   showFormula: PropTypes.bool,
   url: PropTypes.string,
 };
 const defaultProps = {
   showFormula: true,
 };
 
-export default function MetricOption({ metric, showFormula, url }) {
+export default function MetricOption({ metric, openInNewWindow, showFormula, url }) {
   const verbose = metric.verbose_name || metric.metric_name;
-  const link = url ? <a href={url}>{verbose}</a> : verbose;
+  const link = url ? <a href={url} target={openInNewWindow ? '_blank' : null}>{verbose}</a> : verbose;
   return (
     <div>
       <span className="m-r-5 option-label">{link}</span>

superset/assets/javascripts/modules/dates.js

@@ -64,7 +64,6 @@ export const tickMultiFormat = d3.time.format.multi([
 ]);
 export const formatDate = function (dttm) {
   const d = UTC(new Date(dttm));
-  // d = new Date(d.getTime() - 1 * 60 * 60 * 1000);
   return tickMultiFormat(d);
 };
 export const fDuration = function (t1, t2, f = 'HH:mm:ss.SS') {

superset/assets/package.json

@@ -40,7 +40,7 @@
   "homepage": "http://superset.apache.org/",
   "dependencies": {
     "@data-ui/event-flow": "0.0.8",
-    "@data-ui/sparkline": "0.0.1",
+    "@data-ui/sparkline": "0.0.47",
     "babel-register": "^6.24.1",
     "bootstrap": "^3.3.6",
     "brace": "^0.10.0",
@@ -70,7 +70,7 @@
     "react-addons-css-transition-group": "^15.6.0",
     "react-addons-shallow-compare": "^15.4.2",
     "react-alert": "^2.3.0",
-    "react-bootstrap": "^0.31.2",
+    "react-bootstrap": "^0.31.5",
     "react-bootstrap-table": "^4.0.2",
     "react-color": "^2.13.8",
     "react-datetime": "2.9.0",
@@ -80,7 +80,7 @@
     "react-map-gl": "^3.0.4",
     "react-redux": "^5.0.2",
     "react-resizable": "^1.3.3",
-    "react-select": "1.0.0-rc.3",
+    "react-select": "1.0.0-rc.10",
     "react-select-fast-filter-options": "^0.2.1",
     "react-sortable-hoc": "^0.6.7",
     "react-split-pane": "^0.1.66",
@@ -106,8 +106,6 @@
     "babel-plugin-css-modules-transform": "^1.1.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-airbnb": "^2.1.1",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.11.1",
     "chai": "^4.0.2",
     "clean-webpack-plugin": "^0.1.16",
     "codeclimate-test-reporter": "^0.5.0",

superset/assets/spec/javascripts/components/MetricOption_spec.jsx

@@ -50,4 +50,13 @@ describe('MetricOption', () => {
     wrapper = shallow(factory(props));
     expect(wrapper.find(InfoTooltipWithTrigger)).to.have.length(1);
   });
+  it('sets target="_blank" when openInNewWindow is true', () => {
+    props.url = 'https://github.com/apache/incubator-superset';
+    wrapper = shallow(factory(props));
+    expect(wrapper.find('a').prop('target')).to.equal(null);
+
+    props.openInNewWindow = true;
+    wrapper = shallow(factory(props));
+    expect(wrapper.find('a').prop('target')).to.equal('_blank');
+  });
 });

superset/assets/stylesheets/react-select/select.less

@@ -1,99 +1,13 @@
-// @mistercrunch
-@select-primary-color: black;
-
-/**
- * React Select
- * ============
- * Created by Jed Watson and Joss Mackison for KeystoneJS, http://www.keystonejs.com/
- * https://twitter.com/jedwatson https://twitter.com/jossmackison https://twitter.com/keystonejs
- * MIT License: https://github.com/keystonejs/react-select
-*/
-
-// Variables
-// ------------------------------
-
-// common
-//@select-primary-color:             #007eff;
-
-// control options
-@select-input-bg:                  #fff;
-@select-input-bg-disabled:         #f9f9f9;
-@select-input-border-color:        #ccc;
-@select-input-border-radius:       4px;
-@select-input-border-focus:        @select-primary-color;
-@select-input-border-width:        1px;
-@select-input-height:              30px;
-@select-input-internal-height:     (@select-input-height - (@select-input-border-width * 2));
-@select-input-placeholder:         #aaa;
-@select-text-color:                #333;
-@select-link-hover-color:          @select-input-border-focus;
-
-@select-padding-vertical:          8px;
-@select-padding-horizontal:        10px;
-
-// menu options
-@select-menu-zindex:               1;
-@select-menu-max-height:           200px;
-
-@select-option-color:              lighten(@select-text-color, 20%);
-@select-option-bg:                 @select-input-bg;
-@select-option-focused-color:      @select-text-color;
-@select-option-focused-bg:         fade(@select-primary-color, 8%);
-@select-option-focused-bg-fb:      mix(@select-primary-color, @select-option-bg, 8%);  // Fallback color for IE 8
-@select-option-selected-color:     @select-text-color;
-@select-option-selected-bg:        fade(@select-primary-color, 4%);
-@select-option-selected-bg-fb:      mix(@select-primary-color, @select-option-bg, 4%);  // Fallback color for IE 8
-@select-option-disabled-color:     lighten(@select-text-color, 60%);
-
-@select-noresults-color:           lighten(@select-text-color, 40%);
-
-// clear "x" button
-@select-clear-size:                floor((@select-input-height / 2));
-@select-clear-color:               #999;
-@select-clear-hover-color:         #D0021B; // red
-@select-clear-width:               (@select-input-internal-height / 2);
-
-// arrow indicator
-@select-arrow-color:               #999;
-@select-arrow-color-hover:         #666;
-@select-arrow-width:               5px;
-
-// loading indicator
-@select-loading-size:              16px;
-@select-loading-color:             @select-text-color;
-@select-loading-color-bg:          @select-input-border-color;
-
-// multi-select item
-@select-item-font-size:            .9em;
-
-@select-item-bg:                   fade(@select-primary-color, 8%);
-@select-item-bg-fb:                mix(@select-primary-color, @select-input-bg, 8%);  // Fallback color for IE 8
-@select-item-color:                @select-primary-color;
-@select-item-border-color:         fade(@select-primary-color, 24%);
-@select-item-border-color-fb:      mix(@select-primary-color, @select-input-bg, 24%);  // Fallback color for IE 8
-@select-item-hover-color:          darken(@select-item-color, 5%);
-@select-item-hover-bg:             darken(@select-item-bg, 5%);
-@select-item-hover-bg-fb:          mix(darken(@select-primary-color, 5%), @select-item-bg-fb, 8%);  // Fallback color for IE 8
-@select-item-disabled-color:       #333;
-@select-item-disabled-bg:          #fcfcfc;
-@select-item-disabled-border-color: darken(@select-item-disabled-bg, 10%);
-
-@select-item-border-radius:        2px;
-@select-item-gutter:               5px;
-
-@select-item-padding-horizontal:   5px;
-@select-item-padding-vertical:     2px;
+@import "~react-select/less/select.less";
+@select-primary-color:              black;
 
 // imports
-// @mistercrunch: these were altered to point to react-select/less
-@import "../../node_modules/react-select/less/control.less";
-@import "../../node_modules/react-select/less/menu.less";
-@import "../../node_modules/react-select/less/mixins.less";
-@import "../../node_modules/react-select/less/multi.less";
-@import "../../node_modules/react-select/less/spinner.less";
+@import "~react-select/less/control.less";
+@import "~react-select/less/menu.less";
+@import "~react-select/less/mixins.less";
+@import "~react-select/less/multi.less";
+@import "~react-select/less/spinner.less";
 
-// importing css from "../../node_modules/react-virtualized-select/styles.css";
-// so the background color of a selected option matches the other selects
 .VirtualSelectGrid {
   z-index: 1;
 }

superset/assets/stylesheets/superset.less

@@ -32,6 +32,10 @@ input.form-control {
     background-color: white;
 }
 
+input.form-control.input-sm {
+  height: 36px;
+}
+
 .chart-header a.danger {
     color: red;
 }
@@ -346,11 +350,10 @@ iframe {
   .Select-multi-value-wrapper {
     display: flex;
     flex-wrap: wrap;
-    padding-bottom: 3px;
   }
 
   .Select-value {
-    line-height: 1.2;
+    height: 23px;
   }
 
   .Select-input > input {

superset/assets/visualizations/nvd3_vis.js

@@ -296,9 +296,7 @@ function nvd3Vis(slice, payload) {
       case 'box_plot':
         colorKey = 'label';
         chart = nv.models.boxPlotChart();
-        chart.x(function (d) {
-          return d.label;
-        });
+        chart.x(d => d.label);
         chart.staggerLabels(true);
         chart.maxBoxWidth(75); // prevent boxes from being incredibly wide
         break;
@@ -353,7 +351,8 @@ function nvd3Vis(slice, payload) {
       chart.x2Axis.tickFormat(xAxisFormatter);
       height += 30;
     }
-    if (vizType !== 'dist_bar' && chart.xAxis && chart.xAxis.tickFormat) {
+    const isXAxisString = ['dist_bar', 'box_plot'].indexOf(vizType) >= 0;
+    if (!isXAxisString && chart.xAxis && chart.xAxis.tickFormat) {
       chart.xAxis.tickFormat(xAxisFormatter);
     }