You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2019/10/17 14:31:10 UTC

[incubator-echarts-doc] branch master updated (b5e514b -> 28dbac8)

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git.


    from b5e514b  Add global var and doc tips.
     new 4596285  rm the rest of files from cn to zh
     new c4ca216  fix: build script after mv cn to zh.
     new 28dbac8  fix links in custom build tutorial.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.js                             | 16 +++++-----------
 en/tutorial/custom-build.md          |  8 ++++----
 release.sh                           |  2 +-
 {cn => zh}/option/partial/clip.md    |  0
 {cn => zh}/option/partial/version.md |  0
 zh/tutorial/custom-build.md          |  6 +++---
 6 files changed, 13 insertions(+), 19 deletions(-)
 rename {cn => zh}/option/partial/clip.md (100%)
 rename {cn => zh}/option/partial/version.md (100%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[incubator-echarts-doc] 01/03: rm the rest of files from cn to zh

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git

commit 4596285b3d1411d9dcbb1c38dcbb9d381cb78c91
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Thu Oct 17 22:23:33 2019 +0800

    rm the rest of files from cn to zh
---
 {cn => zh}/option/partial/clip.md    | 0
 {cn => zh}/option/partial/version.md | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/cn/option/partial/clip.md b/zh/option/partial/clip.md
similarity index 100%
rename from cn/option/partial/clip.md
rename to zh/option/partial/clip.md
diff --git a/cn/option/partial/version.md b/zh/option/partial/version.md
similarity index 100%
rename from cn/option/partial/version.md
rename to zh/option/partial/version.md


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[incubator-echarts-doc] 03/03: fix links in custom build tutorial.

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git

commit 28dbac88e844a79eb7514abc6d8f27e816a1a495
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Thu Oct 17 22:30:52 2019 +0800

    fix links in custom build tutorial.
---
 en/tutorial/custom-build.md | 8 ++++----
 zh/tutorial/custom-build.md | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/en/tutorial/custom-build.md b/en/tutorial/custom-build.md
index ae62c15..fac4824 100644
--- a/en/tutorial/custom-build.md
+++ b/en/tutorial/custom-build.md
@@ -4,20 +4,20 @@
 # Create Custom Build of ECharts
 
 
-In most cases, ECharts builds can be downloaded from the [download page](https://ecomfe.github.io/echarts-doc/public/en/download.html) or from the `echarts/dist` directory in our [GitHub project](https://github.com/ecomfe/echarts/releases), where
+In most cases, ECharts builds can be downloaded from the [download page](${wesitePath}/en/download.html) or from the `echarts/dist` directory in our [GitHub project](https://github.com/ecomfe/echarts/releases), where
 these pre-builds are provided:
 
 + Complete verion: `echarts/dist/echarts.js`, including all charts and components (see `echarts/echarts.all.js` for detail), but has maximum file size.
 + Common version: `echarts/dist/echarts.common.js`, including common charts and components (see `echarts/echarts.common.js` for detail), moderate file size.
 + Simple version: `echarts/dist/echarts.simple.js`, including a smaller subset of the most common charts and components (see `echarts/echarts.simple.js` for detail), small file size.
 
-If it is important for your use case to reduce the size of your ECharts dependency, you can customize your ECharts build by using one of these approaches:
+We can also build echarts ourselves, which enables to only include the charts and components you needed. You can customize your ECharts build by using one of these approaches:
 
-+ [Online custom build tool](http://echarts.baidu.com/builder.html) is relatively convenient (Currently available in Chinese only)
++ [Online custom build tool](${wesitePath}/en/builder.html) is relatively convenient.
 + The script `echarts/build/build.js` found in the project is flexible for module selecting, and supports multi-language builds
 + Build ECharts and your project directly by using tools such as [rollup](https://rollupjs.org/), [webpack](https://webpack.github.io/), [browserify](http://browserify.org/)
 
-Below are some examples to illustrate the latter two approaches.
+There are some examples to illustrate the latter two approaches below.
 
 ## Prepare: create our project and install echarts
 
diff --git a/zh/tutorial/custom-build.md b/zh/tutorial/custom-build.md
index 4c2d125..3fc1bed 100644
--- a/zh/tutorial/custom-build.md
+++ b/zh/tutorial/custom-build.md
@@ -2,15 +2,15 @@
 
 # 自定义构建 ECharts
 
-一般来说,可以直接从 [echarts 下载页](http://echarts.baidu.com/download.html) 中获取构建好的 echarts,也可以从 [GitHub](https://github.com/ecomfe/echarts/releases) 中的 `echarts/dist` 文件夹中获取构建好的 echarts,这都可以直接在浏览器端项目中使用。这些构建好的 echarts 提供了下面这几种定制:
+一般来说,可以直接从 [echarts 下载页](${wesitePath}/zh/download.html) 中获取构建好的 echarts,也可以从 [GitHub](https://github.com/ecomfe/echarts/releases) 中的 `echarts/dist` 文件夹中获取构建好的 echarts,这都可以直接在浏览器端项目中使用。这些构建好的 echarts 提供了下面这几种定制:
 
 + 完全版:`echarts/dist/echarts.js`,体积最大,包含所有的图表和组件,所包含内容参见:`echarts/echarts.all.js`。
 + 常用版:`echarts/dist/echarts.common.js`,体积适中,包含常见的图表和组件,所包含内容参见:`echarts/echarts.common.js`。
 + 精简版:`echarts/dist/echarts.simple.js`,体积较小,仅包含最常用的图表和组件,所包含内容参见:`echarts/echarts.simple.js`。
 
-如果对文件体积有更严苛的要求,可以自己构建 echarts,能够仅仅包括自己所需要的图表和组件。自定义构建有几种方式:
+我们也可以自己构建 echarts,能够仅仅包括自己所需要的图表和组件。可以用这几种方式自定义构建:
 
-+ [在线自定义构建](http://echarts.baidu.com/builder.html):比较方便。
++ [在线自定义构建](${wesitePath}/zh/builder.html):比较方便。
 + 使用 `echarts/build/build.js` 脚本自定义构建:比在线构建更灵活一点,并且支持多语言。
 + 直接使用构建工具(如 [rollup](https://rollupjs.org/)、[webpack](https://webpack.github.io/)、[browserify](http://browserify.org/))自己构建:也是一种选择。
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[incubator-echarts-doc] 02/03: fix: build script after mv cn to zh.

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git

commit c4ca21665e3b322df2b9b143678b46b1e450d5cb
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Thu Oct 17 22:25:44 2019 +0800

    fix: build script after mv cn to zh.
---
 build.js   | 16 +++++-----------
 release.sh |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/build.js b/build.js
index 0c40446..25069e3 100644
--- a/build.js
+++ b/build.js
@@ -38,7 +38,7 @@ function initEnv() {
 
 var config = initEnv();
 
-var languages = ['cn', 'en'];
+var languages = ['zh', 'en'];
 
 config.gl = config.gl || {};
 for (var key in config) {
@@ -47,15 +47,10 @@ for (var key in config) {
     }
 }
 
-function getDistLang(lang) {
-    return lang === 'cn' ? 'zh' : lang;
-}
-
 function run() {
     languages.forEach(function (language) {
-        var distLang = getDistLang(language);
-        if (!fs.existsSync('public/' + distLang + '/documents/' + distLang)) {
-            fs.mkdirSync('public/' + distLang + '/documents/' + distLang);
+        if (!fs.existsSync('public/' + language + '/documents/' + language)) {
+            fs.mkdirSync('public/' + language + '/documents/' + language);
         }
         md2json(
             {
@@ -110,7 +105,7 @@ function run() {
         );
 
         fs.writeFileSync(
-            'public/' + distLang + '/documents/' + distLang + '/changelog.html',
+            'public/' + language + '/documents/' + language + '/changelog.html',
             marked(fs.readFileSync(language + '/changelog.md', 'utf-8')),
             'utf-8'
         );
@@ -145,8 +140,7 @@ function run() {
 }
 
 function writeSingleSchema(schema, language, docName, format) {
-    var distLang = getDistLang(language);
-    var path = 'public/documents/' + distLang + '/' + docName + '.json';
+    var path = 'public/documents/' + language + '/' + docName + '.json';
     console.log('output: ' + path);
     fs.writeFileSync(
         path,
diff --git a/release.sh b/release.sh
index a38a4a2..aee0fb3 100644
--- a/release.sh
+++ b/release.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`; pwd)
 currPath=$(pwd)
 
 
-# Build cn doc for www.echartsjs.com.
+# Build zh doc for www.echartsjs.com.
 cd ${basepath}
 node ./build.js --env ${envType}
 cd ${currPath}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org