diff --git a/src/frontend/fill-lang.js b/src/frontend/fill-lang.js new file mode 100644 index 000000000..4ba24ea97 --- /dev/null +++ b/src/frontend/fill-lang.js @@ -0,0 +1,35 @@ +const fs = require('fs'); +const path = require('path'); + +const defaultValue = require('./src/assets/i18n/zh-Hans.json'); +// 添加语言后请在下边数组添加文件名 +const files = ['en']; +function fill(target, source) { + if (target === undefined) target = {}; + for(let key in source) { + if (typeof source[key] === 'object') { + target[key] = fill(target[key], source[key]); + } else { + if (!target[key]) { + target[key] = source[key]; + } + } + } + return target; +} +for(let file of files) { + const filePath = path.resolve(__dirname, 'src/assets/i18n', file +'.json'); + if (fs.existsSync(filePath)) { + let value = require(filePath); + if (typeof value !== 'object') { + value = {}; + } + value = JSON.stringify(fill(value, defaultValue), null, 4); + fs.writeFile(filePath, value, 'utf8', err => { + if (err) throw error(err); + console.log('done'); + }) + } else { + throw error(`${file}.json不存在`) + } +} \ No newline at end of file diff --git a/src/frontend/lib b/src/frontend/lib index 6ff8cf3bf..7a9ca86f6 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 6ff8cf3bf2cca7f14fc72d3946b3a659d38299e8 +Subproject commit 7a9ca86f691a0b7760b61cd318906ac9519459a7 diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 6dde5540d..4f112aa67 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -324,7 +324,6 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.2.4", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -496,6 +495,22 @@ "webpack-sources": "1.1.0" } }, + "@ngx-translate/core": { + "version": "11.0.1", + "resolved": "http://registry.npm.taobao.org/@ngx-translate/core/download/@ngx-translate/core-11.0.1.tgz", + "integrity": "sha1-zs761B8GNo9YWdrEj+yPzESFYV8=", + "requires": { + "tslib": "1.9.3" + } + }, + "@ngx-translate/http-loader": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/@ngx-translate/http-loader/download/@ngx-translate/http-loader-4.0.0.tgz", + "integrity": "sha1-ilVSSK1LfVE0YPzsnaJbBEeWLx0=", + "requires": { + "tslib": "1.9.3" + } + }, "@schematics/angular": { "version": "0.7.5", "resolved": "http://registry.npm.taobao.org/@schematics/angular/download/@schematics/angular-0.7.5.tgz", @@ -2165,7 +2180,6 @@ "anymatch": "2.0.0", "async-each": "1.0.1", "braces": "2.3.2", - "fsevents": "1.2.4", "glob-parent": "3.1.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -4313,535 +4327,6 @@ "resolved": "http://r.cnpmjs.org/fs.realpath/download/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "1.2.4", - "resolved": "http://r.cnpmjs.org/fsevents/download/fsevents-1.2.4.tgz", - "integrity": "sha1-9B3LGvJYKvNpLaNvxVy9jhBBxCY=", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, "fstream": { "version": "1.0.11", "resolved": "http://r.cnpmjs.org/fstream/download/fstream-1.0.11.tgz", @@ -6464,7 +5949,6 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.2.4", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", diff --git a/src/frontend/package.json b/src/frontend/package.json index f4295b578..3a1efa6ce 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -24,6 +24,8 @@ "@clr/angular": "^0.12.14", "@clr/icons": "^0.12.14", "@clr/ui": "^0.12.14", + "@ngx-translate/core": "^11.0.1", + "@ngx-translate/http-loader": "^4.0.0", "@webcomponents/custom-elements": "^1.1.2", "ace": "^1.3.0", "bootstrap": "^4.0.0-alpha.5", diff --git a/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html b/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html index a0b8493b3..3155d5aa4 100644 --- a/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html +++ b/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html @@ -6,7 +6,7 @@
- +
{{title}}
- +
@@ -44,7 +44,7 @@
diff --git a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html index bb164acb0..d7fe3211f 100644 --- a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html +++ b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html @@ -26,18 +26,18 @@ - 创建者 + {{'TITLE.CREATE_USER' | translate}} - 创建时间 + {{'TITLE.CREATE_TIME' | translate}} - + {{daemonset.id}} {{daemonset.name}} diff --git a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html index 649a5bcd1..4de73884f 100644 --- a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html +++ b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html @@ -26,12 +26,12 @@

已删除守护进程集列表

- 创建者 + {{'TITLE.CREATE_USER' | translate}} - 创建时间 + {{'TITLE.CREATE_TIME' | translate}} diff --git a/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html b/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html index e08074880..ccedb2019 100644 --- a/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html +++ b/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html @@ -19,7 +19,7 @@
- +
diff --git a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html index 927ef31ba..adb6b5db9 100644 --- a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html +++ b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html @@ -17,7 +17,7 @@ - + {{permission.id}} {{permission.name}} diff --git a/src/frontend/src/app/admin/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html b/src/frontend/src/app/admin/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html index 99a1cec8a..51cf632e9 100644 --- a/src/frontend/src/app/admin/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html +++ b/src/frontend/src/app/admin/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html @@ -35,7 +35,7 @@

{{title}}[{{cluster?.name}}]

- +
{{title}}[{{cluster?.name}}]
+ shape="trash" [title]="'PVC.DELETE_LABEL' | translate" class="is-solid clr-icon"> + shape="plus-circle" [title]="'PVC.ADD_LABEL' | translate" class="is-solid clr-icon">
- +
-
@@ -99,7 +99,7 @@

{{title}}[{{cluster?.name}}]

- +
@@ -116,9 +116,9 @@

{{title}}[{{cluster?.name}}]

diff --git a/src/frontend/src/app/admin/persistentvolume/list-persistentvolume/list-persistentvolume.component.html b/src/frontend/src/app/admin/persistentvolume/list-persistentvolume/list-persistentvolume.component.html index 609d5608e..f95d9eef1 100644 --- a/src/frontend/src/app/admin/persistentvolume/list-persistentvolume/list-persistentvolume.component.html +++ b/src/frontend/src/app/admin/persistentvolume/list-persistentvolume/list-persistentvolume.component.html @@ -1,5 +1,5 @@ - 暂无数据! + {{'MESSAGE.NO_MESSAGE' | translate}} 名称 @@ -12,8 +12,8 @@ - - 访问模式 + + {{'PVC.ACCESS_PATTERN' | translate}} @@ -50,7 +50,7 @@ - + {{pv.metadata.name}} {{pv.spec.capacity.storage}} diff --git a/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.html b/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.html index 0d31c2c4a..8d45dc3e6 100644 --- a/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.html +++ b/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.html @@ -9,7 +9,7 @@ - 名称 + {{'TITLE.NAME' | translate}} 总量 访问模式 回收策略 diff --git a/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.ts b/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.ts index 175bb4c37..b22806721 100644 --- a/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.ts +++ b/src/frontend/src/app/admin/persistentvolume/persistentvolume.component.ts @@ -22,7 +22,7 @@ const showState = { '名称': {hidden: false}, '总量': {hidden: false}, '回收策略': {hidden: true}, - '访问模式': {hidden: false}, + 'access_pattern': {hidden: false}, '状态': {hidden: false}, '已绑定PVC': {hidden: false}, '原因': {hidden: true}, diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html index 6583f9caa..931709eea 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html @@ -4,7 +4,7 @@
- +
{{title}} pattern="[a-z]([-a-z0-9]*[a-z0-9])?" (keyup)='handleValidation()'> - 名称不符合规范,验证规则[a-z]([-a-z0-9]*[a-z0-9])? + {{'RULE.REGEXT' | translate}}[a-z]([-a-z0-9]*[a-z0-9])? @@ -34,7 +34,7 @@
- +
diff --git a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html index e460e17fa..57e98ecdb 100644 --- a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html +++ b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html @@ -26,18 +26,18 @@
- 创建者 + {{'TITLE.CREATE_USER' | translate}} - 创建时间 + {{'TITLE.CREATE_TIME' | translate}} - + {{secret.id}} {{secret.name}} diff --git a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html index 8ca9f0623..d5dfb1034 100644 --- a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html +++ b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html @@ -26,12 +26,12 @@

已删除加密文件列表

- 创建者 + {{'TITLE.CREATE_USER' | translate}} - 创建时间 + {{'TITLE.CREATE_TIME' | translate}} diff --git a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html index fbba69954..4597d910f 100644 --- a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html +++ b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html @@ -15,7 +15,7 @@
- +
@@ -53,8 +53,8 @@

创建配置集模版

diff --git a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html index e0183e82e..0259b9095 100644 --- a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html +++ b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html @@ -1,38 +1,38 @@ - 暂无数据! + {{'MESSAGE.NO_MESSAGE' | translate}} # - - 创建时间 + + {{'TITLE.CREATE_TIME' | translate}} - - 配置机房 + + {{'TITLE.CONFIG_CLUSTER' | translate}} - - 已上线机房 + + {{'TITLE.ONLINE_CLUSTER' | translate}} - - 发布说明 + + {{'TITLE.RELEASE_EXPLAIN' | translate}} - - 创建者 + + {{'TITLE.CREATE_USER' | translate}} - - 操作 + + {{'TITLE.ACTION' | translate}} @@ -60,23 +60,23 @@ + {{'BUTTON.RELEASE' | translate}} + {{'BUTTON.DETAIL' | translate}} + {{'BUTTON.CLONE' | translate}} + {{'BUTTON.DELETE' | translate}} + {{'BUTTON.DROP' | translate}} diff --git a/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.html b/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.html index a5216bd49..d64695b99 100644 --- a/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.html +++ b/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.html @@ -4,7 +4,7 @@
- +
{{title}}
-
diff --git a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts index 045b46bac..0976f6ef8 100644 --- a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts +++ b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts @@ -262,7 +262,7 @@ export class CreateEditDeploymentTplComponent implements OnInit, AfterViewInit, let tpl = response[2]; if (tpl) { this.deploymentTpl = tpl.data; - // 克隆置空发布说明 + this.deploymentTpl.description = null; this.saveDeployment(JSON.parse(this.deploymentTpl.template)); } diff --git a/src/frontend/src/app/portal/deployment/deployment.component.html b/src/frontend/src/app/portal/deployment/deployment.component.html index 59ef1faa9..05c242db2 100644 --- a/src/frontend/src/app/portal/deployment/deployment.component.html +++ b/src/frontend/src/app/portal/deployment/deployment.component.html @@ -1,5 +1,5 @@
@@ -16,32 +16,32 @@ diff --git a/src/frontend/src/app/portal/deployment/deployment.component.ts b/src/frontend/src/app/portal/deployment/deployment.component.ts index c4101616a..f112ed5ca 100644 --- a/src/frontend/src/app/portal/deployment/deployment.component.ts +++ b/src/frontend/src/app/portal/deployment/deployment.component.ts @@ -34,14 +34,15 @@ import {Subscription} from 'rxjs/Subscription'; import {PageState} from '../../shared/page/page-state'; import {TabDragService} from '../../shared/client/v1/tab-drag.service'; import {OrderItem} from '../../shared/model/v1/order'; +import {TranslateService} from '@ngx-translate/core'; const showState = { - '创建时间': {hidden: false}, - '版本': {hidden: false}, - '上线机房': {hidden: false}, - '发布说明': {hidden: false}, - '创建者': {hidden: false}, - '操作': {hidden: false} + 'create_time': {hidden: false}, + 'version': {hidden: false}, + 'online_cluster': {hidden: false}, + 'release_explain': {hidden: false}, + 'create_user': {hidden: false}, + 'action': {hidden: false} }; @Component({ @@ -76,6 +77,7 @@ export class DeploymentComponent implements OnInit, OnDestroy { private deploymentTplService: DeploymentTplService, private deploymentClient: DeploymentClient, private route: ActivatedRoute, + public translate: TranslateService, private router: Router, private publishService: PublishService, public cacheService: CacheService, diff --git a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html index 06473b86d..94d2d7d95 100644 --- a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html +++ b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html @@ -1,40 +1,40 @@ - 暂无数据 + {{'MESSAGE.NO_MESSAGE' | translate}} ID - - 创建时间 + + {{'TITLE.CREATE_TIME' | translate}} - - 版本 + + {{'TITLE.VERSION' | translate}} - - 上线机房 + + {{'TITLE.ONLINE_CLUSTER' | translate}} - - 发布说明 + + {{'TITLE.RELEASE' | translate}}{{'TITLE.EXPLAIN' | translate}} - - 创建者 + + {{'TITLE.CREATE_USER' | translate}} - - 操作 + + {{'TITLE.ACTION' | translate}} @@ -72,27 +72,27 @@ + {{'BUTTON.RELEASE' | translate}} + {{'BUTTON.RESTART' | translate}} + {{'BUTTON.DETAIL' | translate}} + {{'BUTTON.CLONE' | translate}} + {{'BUTTON.DELETE' | translate}} + {{'BUTTON.DROP' | translate}} diff --git a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts index e0bffa8d3..cd574b6f2 100644 --- a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts +++ b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts @@ -23,6 +23,7 @@ import {ActivatedRoute, Router} from '@angular/router'; import {Page} from '../../../shared/page/page-state'; import {AceEditorService} from '../../../shared/ace-editor/ace-editor.service'; import {AceEditorMsg} from '../../../shared/ace-editor/ace-editor'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'list-deployment', @@ -58,6 +59,7 @@ export class ListDeploymentComponent implements OnInit, OnDestroy { private router: Router, public authService: AuthService, private tplDetailService: TplDetailService, + private translate: TranslateService, private messageHandlerService: MessageHandlerService) { this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && diff --git a/src/frontend/src/app/portal/deployment/list-event/list-event.component.html b/src/frontend/src/app/portal/deployment/list-event/list-event.component.html index 36a54b5cc..8a8955a7e 100644 --- a/src/frontend/src/app/portal/deployment/list-event/list-event.component.html +++ b/src/frontend/src/app/portal/deployment/list-event/list-event.component.html @@ -3,7 +3,7 @@ - 暂无数据! + {{'MESSAGE.NO_MESSAGE' | translate}} 名称 @@ -42,7 +42,7 @@
-
diff --git a/src/frontend/src/app/portal/namespace-apikey/apikey.component.html b/src/frontend/src/app/portal/namespace-apikey/apikey.component.html index 85f2271a6..081f2df4e 100644 --- a/src/frontend/src/app/portal/namespace-apikey/apikey.component.html +++ b/src/frontend/src/app/portal/namespace-apikey/apikey.component.html @@ -4,23 +4,23 @@
-

APIKey列表

+

APIKey {{'TITLE.LIST' | translate}}

diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.html b/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.html index 8828d1dc8..e689358ec 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.html +++ b/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.html @@ -1,5 +1,5 @@ - + diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html index b499e4615..65f3c02c5 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html +++ b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html @@ -1,5 +1,5 @@ - 暂无数据! + {{'MESSAGE.NO_MESSAGE' | translate}} # @@ -7,32 +7,32 @@ - 创建时间 + {{'TITLE.CREATE_TIME' | translate}} - 配置机房 + {{'TITLE.CONFIG_CLUSTER' | translate}} - 已上线机房 + {{'TITLE.ONLINE_CLUSTER' | translate}} - 发布说明 + {{'TITLE.RELEASE_EXPLAIN' | translate}} - 创建者 + {{'TITLE.CREATE_USER' | translate}} - 操作 + {{'TITLE.ACTION' | translate}} @@ -94,7 +94,7 @@

PVC部署状态

- 暂无数据! + {{'MESSAGE.NO_MESSAGE' | translate}} 机房 @@ -112,7 +112,7 @@

PVC部署状态

- 访问模式 + {{'PVC.ACCESS_PATTERN' | translate}} @@ -132,7 +132,7 @@

PVC部署状态

- 操作 + {{'TITLE.ACTION' | translate}}
diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.html b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.html index d7e544508..e21dabe14 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.html +++ b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.html @@ -1,5 +1,5 @@
@@ -18,40 +18,29 @@
- +
-
diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts index 137c93e08..503d3a41b 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts @@ -22,6 +22,7 @@ import {ConfirmationDialogService} from '../../shared/confirmation-dialog/confir import {PageState} from '../../shared/page/page-state'; import {TabDragService} from '../../shared/client/v1/tab-drag.service'; import {OrderItem} from '../../shared/model/v1/order'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'wayne-persistentvolumeclaim', @@ -55,6 +56,7 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { private tabDragService: TabDragService, private el: ElementRef, private pvcTplService: PersistentVolumeClaimTplService, + public translate: TranslateService, private messageHandlerService: MessageHandlerService) { this.tabScription = this.tabDragService.tabDragOverObservable.subscribe(over => { if (over) this.tabChange(); diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.html b/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.html index dc8635345..b1ed2c562 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.html +++ b/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.html @@ -16,7 +16,7 @@
- +
{{title}}
-
- 暂无数据! + {{'MESSAGE.NO_MESSAGE' | translate}} ID diff --git a/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.html b/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.html index ff17be643..dff051283 100644 --- a/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.html +++ b/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.html @@ -4,25 +4,25 @@
- +
- +
@@ -53,8 +53,8 @@

创建加密字典模版

diff --git a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html index a678f330c..b6a7b1185 100644 --- a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html +++ b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html @@ -1,38 +1,38 @@ - 暂无数据! + {{'MESSAGE.NO_MESSAGE' | translate}} # - - 创建时间 + + {{'TITLE.CREATE_TIME' | translate}} - - 配置机房 + + {{'TITLE.CONFIG_CLUSTER' | translate}} - - 已上线机房 + + {{'TITLE.ONLINE_CLUSTER' | translate}} - - 发布说明 + + {{'TITLE.RELEASE_EXPLAIN' | translate}} - - 创建者 + + {{'TITLE.CREATE_USER' | translate}} - - 操作 + + {{'TITLE.ACTION' | translate}} @@ -60,23 +60,23 @@ + {{'BUTTON.RELEASE' | translate}} + {{'BUTTON.DETAIL' | translate}} + {{'BUTTON.CLONE' | translate}} + {{'BUTTON.DELETE' | translate}} + {{'BUTTON.DROP' | translate}} diff --git a/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.html b/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.html index 27784a638..3e30c607c 100644 --- a/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.html +++ b/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.html @@ -4,7 +4,7 @@
- +
{{title}}
-
-
diff --git a/src/frontend/src/app/portal/statefulset/statefulset.component.html b/src/frontend/src/app/portal/statefulset/statefulset.component.html index 6a53ca40a..fc98a1029 100644 --- a/src/frontend/src/app/portal/statefulset/statefulset.component.html +++ b/src/frontend/src/app/portal/statefulset/statefulset.component.html @@ -1,5 +1,5 @@
@@ -16,32 +16,32 @@ diff --git a/src/frontend/src/app/portal/statefulset/statefulset.component.ts b/src/frontend/src/app/portal/statefulset/statefulset.component.ts index df7b76352..4a168f1e5 100644 --- a/src/frontend/src/app/portal/statefulset/statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/statefulset.component.ts @@ -35,14 +35,15 @@ import {KubeStatefulSet} from '../../shared/model/v1/kubernetes/statefulset'; import {TemplateStatus} from '../../shared/model/v1/status'; import {TabDragService} from '../../shared/client/v1/tab-drag.service'; import {OrderItem} from '../../shared/model/v1/order'; +import {TranslateService} from '@ngx-translate/core'; const showState = { - '创建时间': {hidden: false}, - '版本': {hidden: false}, - '上线机房': {hidden: false}, - '发布说明': {hidden: false}, - '创建者': {hidden: false}, - '操作': {hidden: false} + 'create_time': {hidden: false}, + 'version': {hidden: false}, + 'online_cluster': {hidden: false}, + 'release_explain': {hidden: false}, + 'create_user': {hidden: false}, + 'action': {hidden: false} }; @Component({ @@ -84,7 +85,8 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit private cdr: ChangeDetectorRef, private appService: AppService, private tabDragService: TabDragService, - private el: ElementRef, + private el: ElementRef, + public translate: TranslateService, private deletionDialogService: ConfirmationDialogService, private clusterService: ClusterService, private messageHandlerService: MessageHandlerService) { diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor.component.html b/src/frontend/src/app/shared/ace-editor/ace-editor.component.html index 818de5738..5dccf87e3 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor.component.html +++ b/src/frontend/src/app/shared/ace-editor/ace-editor.component.html @@ -7,7 +7,7 @@
diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html index 534a173cd..3d5afc155 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html @@ -8,19 +8,19 @@