From 01c2b12d579ea99350a1b33a8b803e79dd2bf7b1 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Tue, 12 Nov 2019 20:39:54 +0800 Subject: [PATCH] Change all Chinese names to English (#1207) * Modify webpack configuration * Change all Chinese names to English --- dolphinscheduler-ui/build/combo.js | 12 +-- dolphinscheduler-ui/build/config.js | 2 +- .../pages/servers/_source/gaugeOption.js | 62 +++++++------- .../pages/monitor/pages/servers/alert.vue | 2 +- .../_source/instanceConditions/common.js | 2 +- .../definition/pages/list/_source/email.vue | 4 +- .../pages/index/_source/defineUserCount.vue | 2 +- .../instance/pages/gantt/_source/gantt.js | 14 ++-- .../pages/instance/pages/gantt/index.vue | 8 +- .../pages/instance/pages/list/index.vue | 34 ++++---- .../projects/pages/taskInstance/index.vue | 8 +- .../pages/file/pages/create/index.vue | 2 +- .../pages/file/pages/details/_source/utils.js | 2 +- .../pages/file/pages/details/index.vue | 2 +- .../pages/warningGroups/_source/list.vue | 3 +- .../src/js/module/ana-charts/common.js | 44 ++++++---- .../src/js/module/ana-charts/index.js | 10 +-- .../module/ana-charts/packages/bar/index.js | 84 +++++++++---------- .../src/js/module/ana-charts/packages/base.js | 10 +-- .../ana-charts/packages/funnel/index.js | 30 +++---- .../module/ana-charts/packages/line/index.js | 56 ++++++------- .../module/ana-charts/packages/pie/index.js | 30 +++---- .../module/ana-charts/packages/radar/index.js | 34 ++++---- .../ana-charts/packages/scatter/index.js | 34 ++++---- .../crontab/source/_source/input-number.vue | 6 +- .../components/crontab/source/_times/day.vue | 64 +++++++------- .../components/crontab/source/_times/hour.vue | 44 +++++----- .../crontab/source/_times/minute.vue | 42 +++++----- .../crontab/source/_times/month.vue | 42 +++++----- .../crontab/source/_times/second.vue | 46 +++++----- .../components/crontab/source/_times/year.vue | 44 +++++----- .../module/components/crontab/source/app.vue | 8 +- .../components/crontab/source/util/index.js | 6 +- .../components/secondaryMenu/_source/menu.js | 18 ---- 34 files changed, 404 insertions(+), 407 deletions(-) diff --git a/dolphinscheduler-ui/build/combo.js b/dolphinscheduler-ui/build/combo.js index 48909107e2..143e251e68 100644 --- a/dolphinscheduler-ui/build/combo.js +++ b/dolphinscheduler-ui/build/combo.js @@ -55,7 +55,7 @@ var jslibs = { 'local': [] } -// css集合 +// css csslibs = { 'base': [ 'normalize/7.0.0/normalize.min.css', @@ -72,14 +72,14 @@ csslibs = { ] } -// 创建文件夹目录 +// Create folder directory var dirPath = path.resolve(__dirname, '..', 'src/combo/' + version) if (!fs.existsSync(dirPath)) { fs.mkdirSync(dirPath) - console.log('文件夹创建成功') + console.log('Folder created successfully') } else { - console.log('文件夹已存在') + console.log('Folder already exists') } var jsKeys = Object.keys(jslibs) @@ -93,7 +93,7 @@ jsUrl.forEach((v, i) => { var stream = fs.createWriteStream(path.join(dirPath, jsKeys[i] + '.js'), { encoding: 'utf-8' }) request(url).pipe(stream).on('close', function (err) { if (!err) { - console.log('文件[' + version + '/' + jsKeys[i] + '.js' + ']下载完毕') + console.log('file[' + version + '/' + jsKeys[i] + '.js' + ']Download completed') } }) }) @@ -109,7 +109,7 @@ cssUrl.forEach((v, i) => { var stream = fs.createWriteStream(path.join(dirPath, cssKeys[i] + '.css'), { encoding: 'utf-8' }) request(url).pipe(stream).on('close', function (err) { if (!err) { - console.log('文件[' + version + '/' + cssKeys[i] + '.css' + ']下载完毕') + console.log('file[' + version + '/' + cssKeys[i] + '.css' + ']Download completed') } }) }) diff --git a/dolphinscheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js index f0c555c773..ffa6bfc99e 100644 --- a/dolphinscheduler-ui/build/config.js +++ b/dolphinscheduler-ui/build/config.js @@ -65,7 +65,7 @@ const minifierConfig = isProduction ? { const getPageEntry = view => jsEntry[view] ? view : '' -// 重新定向输出页面 +// Redirect output page const pageRewriter = { 'view/home/index.*': 'index.html' } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js index 98b8ad93c9..b9a14b0f68 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js @@ -19,47 +19,47 @@ export default function (value) { series: [ { type: 'gauge', - center: ['50%', '45%'], // 仪表位置 - radius: '80%', // 仪表大小 - startAngle: 200, // 开始角度 - endAngle: -20, // 结束角度 + center: ['50%', '45%'], // Instrument position + radius: '80%', // Instrument size + startAngle: 200, // Starting angle + endAngle: -20, // End angle axisLine: { show: false, - lineStyle: { // 属性lineStyle控制线条样式 + lineStyle: { // Property linestyle controls line style color: [ [ 0.5, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{ // eslint-disable-line offset: 1, - color: '#E75F25' // 50% 处的颜色 + color: '#E75F25' // 50% Color in place }, { offset: 0.8, - color: '#D9452C' // 40% 处的颜色 - }], false) ], // 100% 处的颜色 + color: '#D9452C' // 40% Color in place + }], false) ], // 100% Color in place [ 0.7, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{ // eslint-disable-line offset: 1, - color: '#FFC539' // 70% 处的颜色 + color: '#FFC539' // 70% Color in place }, { offset: 0.8, - color: '#FE951E' // 66% 处的颜色 + color: '#FE951E' // 66% Color in place }, { offset: 0, - color: '#E75F25' // 50% 处的颜色 + color: '#E75F25' // 50% Color in place }], false) ], [ 0.9, new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ // eslint-disable-line offset: 1, - color: '#C7DD6B' // 90% 处的颜色 + color: '#C7DD6B' // 90% Color in place }, { offset: 0.8, - color: '#FEEC49' // 86% 处的颜色 + color: '#FEEC49' // 86% Color in place }, { offset: 0, - color: '#FFC539' // 70% 处的颜色 + color: '#FFC539' // 70% Color in place }], false) ], [1, new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { // eslint-disable-line offset: 0.2, - color: '#1CAD52' // 92% 处的颜色 + color: '#1CAD52' // 92% Color in place }, { offset: 0, - color: '#C7DD6B' // 90% 处的颜色 + color: '#C7DD6B' // 90% Color in place }], false) ] ], width: 10 @@ -74,7 +74,7 @@ export default function (value) { axisLabel: { show: false }, - pointer: { // 指针样式 + pointer: { // Pointer style length: '45%' }, detail: { @@ -83,34 +83,34 @@ export default function (value) { }, { type: 'gauge', - center: ['50%', '45%'], // 默认全局居中 + center: ['50%', '45%'], // Default global center radius: '70%', startAngle: 200, endAngle: -20, axisLine: { show: true, - lineStyle: { // 属性lineStyle控制线条样式 - color: [ // 表盘颜色 - [ 0.5, '#DA462C' ], // 0-50%处的颜色 - [ 0.7, '#FF9618' ], // 51%-70%处的颜色 - [ 0.9, '#FFED44' ], // 70%-90%处的颜色 - [ 1, '#20AE51' ]// 90%-100%处的颜色 + lineStyle: { // Property linestyle controls line style + color: [ // Dial Color + [ 0.5, '#DA462C' ], // 0-50%Color in place + [ 0.7, '#FF9618' ], // 51%-70%Color in place + [ 0.9, '#FFED44' ], // 70%-90%Color in place + [ 1, '#20AE51' ]// 90%-100%Color in place ], - width: 30// 表盘宽度 + width: 30// Dial width } }, - splitLine: { // 分割线样式(及10、20等长线样式) + splitLine: { // Split line style (and 10, 20 equal length line style) length: 30, - lineStyle: { // 属性lineStyle控制线条样式 + lineStyle: { // Property linestyle controls line style width: 2 } }, - axisTick: { // 刻度线样式(及短线样式) + axisTick: { // Tick mark style (and short line style) length: 20 }, - axisLabel: { // 文字样式(及“10”、“20”等文字样式) + axisLabel: { // Text style (and text styles such as "10", "20") color: 'black', - distance: 5 // 文字离表盘的距离 + distance: 5 // Distance between text and dial }, detail: { formatter: '{score|{value}%}', @@ -120,7 +120,7 @@ export default function (value) { rich: { score: { color: 'white', - fontFamily: '微软雅黑', + fontFamily: 'Microsoft YaHei', fontSize: 32 } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue index c3c7bc923f..4f2ddfdf5c 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue @@ -15,7 +15,7 @@ * limitations under the License. */