From 309b84670bdb2e6efa69c9b87f7dd4aa543b6a7f Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 11:06:57 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/modelarts/notebook/show.tmpl | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3c1237820..2efd5b0a1 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -826,6 +826,7 @@ description_format_err=Description's length can be up to %s characters long. create_dataset = Create Dataset download_url=Download Url download_oper=Operation +download_copy=Copy URL create_dataset_fail=Failed to create dataset. query_dataset_fail=Failed to query dataset. edit_attachment_fail=Failed to update description. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 06a1f3639..52dbc0cc2 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -833,6 +833,7 @@ create_dataset_fail=创建数据集失败。 query_dataset_fail=查询数据集失败。 edit_attachment_fail=修改描述失败。 download_url=数据集下载地址 +download_copy=复制链接 download_oper=操作 show_dataset=数据集 edit_dataset=编辑数据集 diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index b74e22775..7ed54cef5 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -441,7 +441,7 @@ {{.DatasetName}} {{.DatasetDownloadLink}} - 复制链接 + {{$.i18n.Tr "dataset.download_copy"}} {{end}} From 1210db8252ab9e7b1b8372b109d807883db8a44e Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 14:49:31 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- .../js/components/dataset/selectDataset.vue | 11 ++-- web_src/js/features/i18nVue.js | 50 +++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index 97a79d427..84d7ba6b2 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -11,9 +11,9 @@ v-if="benchmarkNew" class="label-fix-width" style="font-weight: normal" - >数据集{{i18n.dataset_label}} - + diff --git a/web_src/js/features/i18nVue.js b/web_src/js/features/i18nVue.js index e649947a4..94fa03870 100644 --- a/web_src/js/features/i18nVue.js +++ b/web_src/js/features/i18nVue.js @@ -57,6 +57,31 @@ export const i18nVue = { dataset_link_failed: "关联数据集失败！", dataset_over_nums: "关联超过?个数据集", cancel_link_dataset: "取消?关联数据集成功！", + image_label:"镜像", + image_select_placeholder:"选择镜像或输入镜像地址", + image_select:"选择镜像", + image_search_placeholder:"搜镜像Tag/描述/标签...", + image_public:"公开镜像", + image_use:"使用", + image_my:"我的镜像", + image_commit:"提交中", + image_commit_content:"检测提交镜像是否大小超过20G！", + image_commit_failed:"提交失败", + image_collected:"我收藏的镜像", + dataset_label:"数据集", + dataset_select_placeholder:"选择数据集文件", + dataset_select:"选择数据集", + dataset_search_placeholder:"搜数据集名称/描述...", + dataset_unziping:"正在解压缩", + dataset_unzip_failed:"解压失败", + dataset_my_upload:"我上传的", + dataset_current_repo:"本项目", + dataset_public:"公开数据集", + dataset_collected:"我收藏的", + dataset_selected:"已选数据文件", + dataset_ok:"确定", + dataset_not_equal_file:"不能选择相同名称的数据文件", + dataset_most:"最多不超过五个文件", }, US: { computer_vision: "computer vision", @@ -119,5 +144,30 @@ export const i18nVue = { dataset_link_failed: "Linked dataset Failed！", dataset_over_nums: "Linked over ? datasets!", cancel_link_dataset: "Cancel ? Linked dataset succeeded!", + image_label:"Image", + image_select_placeholder:"Select image or input image url", + image_select:"Select Image", + image_search_placeholder:"Search image tag/description/label...", + image_public:"Public Image", + image_use:"Use", + image_my:"My Images", + image_commit:"Commiting", + image_commit_content:"Check whether the size of the submitted image exceeds 20g.", + image_commit_failed:"Commit failed", + image_collected:"My collected images", + dataset_label:"Dataset", + dataset_select_placeholder:"Select dataset file", + dataset_select:"Select dataset", + dataset_search_placeholder:"Search dataset name/description ...", + dataset_unziping:"Decompressing", + dataset_unzip_failed:"Decompression failed", + dataset_my_upload:"Upload by me", + dataset_current_repo:"Current Repository", + dataset_public:"Public dataset", + dataset_collected:"My collection", + dataset_selected:"Selected dataset file", + dataset_ok:"OK", + dataset_not_equal_file:"Cannot select a data file with the same name.", + dataset_most:"Up to five files.", }, }; From 25c7b6a5d28c11bf8291190a845455b0d5f737b7 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 15:24:39 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- .../js/components/dataset/selectDataset.vue | 44 +++++++++---------- .../components/images/selectGrampusImages.vue | 27 +++++++----- web_src/js/components/images/selectImages.vue | 42 ++++++++++-------- web_src/js/features/i18nVue.js | 1 + 4 files changed, 64 insertions(+), 50 deletions(-) diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index 84d7ba6b2..4eeccf073 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -38,7 +38,7 @@ type="text" class="disabled" style="width: 48.5%" - placeholder="选择数据集文件" + placeholder="{{i18n.dataset_select_placeholder}}" required /> @@ -59,10 +59,10 @@ ? 'select-dataset-button' : 'select-dataset-button-color' " - >选择数据集 + >{{i18n.dataset_select}} @@ -74,7 +74,7 @@ > @@ -90,7 +90,7 @@ > - + - 正在解压缩 + {{i18n.dataset_unziping}} - 解压失败 + {{i18n.dataset_unzip_failed}} @@ -201,7 +201,7 @@ - + - 正在解压缩 + {{i18n.dataset_unziping}} - 解压失败 + {{i18n.dataset_unzip_failed}} @@ -304,7 +304,7 @@ @@ -380,13 +380,13 @@ class="zip-loading" v-if="data.DecompressState === 2" > - 正在解压缩 + {{i18n.dataset_unziping}} - 解压失败 + {{i18n.dataset_unzip_failed}} @@ -410,7 +410,7 @@ @@ -486,13 +486,13 @@ class="zip-loading" v-if="data.DecompressState === 2" > - 正在解压缩 + {{i18n.dataset_unziping}} - 解压失败 + {{i18n.dataset_unzip_failed}} @@ -536,7 +536,7 @@ line-height: 40px; " > - 已选数据文件 + {{i18n.dataset_selected}}
@@ -558,7 +558,7 @@ color: #fff; border: 1px solid #389e0d; " - >确定{{i18n.dataset_ok}}
@@ -666,10 +666,10 @@ export default { }) ) { this.$refs[data.ref].setChecked(data.id, false, false); - this.$message.warning("不能选择相同名称的数据文件"); + this.$message.warning(i18n.dataset_not_equal_file); } else if (this.selectDatasetArray.length === 5) { this.$refs[data.ref].setChecked(data.id, false, false); - this.$message.error("最多不超过五个文件"); + this.$message.error(i18n.dataset_most); } else { this.selectDatasetArray.push(data); } diff --git a/web_src/js/components/images/selectGrampusImages.vue b/web_src/js/components/images/selectGrampusImages.vue index f702c8cca..9ea56097d 100755 --- a/web_src/js/components/images/selectGrampusImages.vue +++ b/web_src/js/components/images/selectGrampusImages.vue @@ -7,32 +7,32 @@ v-if="benchmarkNew" class="label-fix-width" style="font-weight: normal" - >镜像{{i18n.image_label}} - + 选择镜像 + >{{i18n.image_select}} - +
- +
- 使用 + {{i18n.image_use}}
@@ -169,6 +169,7 @@ export default { }, tableDataPublic: [], loadingPublic: false, + i18n: {}, }; }, methods: { @@ -236,7 +237,13 @@ export default { this.benchmarkNew = true; } }, - created() {}, + created() { + if (document.documentElement.attributes["lang"].nodeValue == "en-US") { + this.i18n = this.$locale.US; + } else { + this.i18n = this.$locale.CN; + } + }, }; diff --git a/web_src/js/components/images/selectImages.vue b/web_src/js/components/images/selectImages.vue index 844303420..2e5d65ebe 100755 --- a/web_src/js/components/images/selectImages.vue +++ b/web_src/js/components/images/selectImages.vue @@ -7,16 +7,16 @@ v-if="benchmarkNew" class="label-fix-width" style="font-weight: normal" - >镜像{{i18n.image_label}} - + 选择镜像 + >{{i18n.image_select}} - +
- +
- 使用 + {{i18n.image_use}}
@@ -142,7 +142,7 @@ - +
- 使用 + {{i18n.image_use}} 提交中{{i18n.image_commit}} 提交失败{{i18n.image_commit_failed}} @@ -254,7 +254,7 @@
- +
- 使用 + {{i18n.image_use}}
@@ -368,7 +368,7 @@ export default { paramsPublic: { page: 1, pageSize: 5, q: "", recommend: false }, tableDataPublic: [], loadingPublic: false, - + i18n: {}, currentPageCustom: 1, pageSizeCustom: 5, totalNumCustom: 0, @@ -513,7 +513,13 @@ export default { this.benchmark = true; } }, - created() {}, + created() { + if (document.documentElement.attributes["lang"].nodeValue == "en-US") { + this.i18n = this.$locale.US; + } else { + this.i18n = this.$locale.CN; + } + }, }; diff --git a/web_src/js/features/i18nVue.js b/web_src/js/features/i18nVue.js index 94fa03870..71770e572 100644 --- a/web_src/js/features/i18nVue.js +++ b/web_src/js/features/i18nVue.js @@ -77,6 +77,7 @@ export const i18nVue = { dataset_my_upload:"我上传的", dataset_current_repo:"本项目", dataset_public:"公开数据集", + dataset_relate:"关联数据集", dataset_collected:"我收藏的", dataset_selected:"已选数据文件", dataset_ok:"确定", From a8a7c4ebe8b7c611ffd919ab395ff498cb0ffc53 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 15:31:15 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/js/components/dataset/selectDataset.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index 4eeccf073..1e9816507 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -38,7 +38,7 @@ type="text" class="disabled" style="width: 48.5%" - placeholder="{{i18n.dataset_select_placeholder}}" + :placeholder="i18n.dataset_select_placeholder" required /> @@ -62,7 +62,7 @@ >{{i18n.dataset_select}} @@ -74,7 +74,7 @@ > From 6c20f50511adcc8aa66a91e3e3abe8ecd5b1ec4a Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 15:38:52 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/js/components/dataset/selectDataset.vue | 8 ++++---- .../js/components/images/selectGrampusImages.vue | 10 +++++----- web_src/js/components/images/selectImages.vue | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index 1e9816507..a1a022a9f 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -144,7 +144,7 @@ + @@ -410,7 +410,7 @@ diff --git a/web_src/js/components/images/selectGrampusImages.vue b/web_src/js/components/images/selectGrampusImages.vue index 9ea56097d..4f777c50a 100755 --- a/web_src/js/components/images/selectGrampusImages.vue +++ b/web_src/js/components/images/selectGrampusImages.vue @@ -16,14 +16,14 @@ name="image" :value="imageAddress" style="width: 48.5%" - placeholder="{{i18n.image_select_placeholder}}" + :placeholder="i18n.image_select_placeholder" /> {{i18n.image_select}} - +
- +
{{i18n.image_select}} - +
- +
- +
- + - +
diff --git a/templates/repo/grampus/trainjob/gpu/new.tmpl b/templates/repo/grampus/trainjob/gpu/new.tmpl index 4d92918cf..384df2214 100755 --- a/templates/repo/grampus/trainjob/gpu/new.tmpl +++ b/templates/repo/grampus/trainjob/gpu/new.tmpl @@ -164,7 +164,7 @@ - 查看样例 + {{.i18n.Tr "cloudbrain.view_sample"}}
From dc746296519c29605441d2c40eb394991283ee77 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 16:11:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 2 +- options/locale/locale_zh-CN.ini | 2 +- templates/repo/modelarts/trainjob/show.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1fa8a1cae..db79287cb 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3129,7 +3129,7 @@ specification = specification select_specification = select specification description = description wrong_specification=You cannot use this specification, please choose another item. - +resource_use=Resource Occupancy job_name_rule = Please enter letters, numbers, _ and - up to 64 characters and cannot end with a dash (-). train_dataset_path_rule = The dataset location is stored in the environment variable data_url, and the output path is stored in the environment variable train_url. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index cf0ee1609..2808ae6ad 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3160,7 +3160,7 @@ delete_task = 删除任务 task_delete_confirm = 你确认删除该任务么？此任务一旦删除不可恢复。 operate_confirm = 确定操作 operate_cancel = 取消操作 - +resource_use=资源占用情况 gpu_num = GPU数 cpu_num = CPU数 diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 71a39424f..dea4bbb5d 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -320,7 +320,7 @@ data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}} {{$.i18n.Tr "repo.modelarts.log"}} - 资源占用情况 + {{$.i18n.Tr "cloudbrain.resource_use"}} {{$.i18n.Tr "repo.model_download"}}
From 073ec9693ea3e63b7359c4c4cffc14a1e280ea51 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 16:23:18 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/js/features/i18nVue.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/js/features/i18nVue.js b/web_src/js/features/i18nVue.js index 71770e572..386f2435f 100644 --- a/web_src/js/features/i18nVue.js +++ b/web_src/js/features/i18nVue.js @@ -166,6 +166,7 @@ export const i18nVue = { dataset_current_repo:"Current Repository", dataset_public:"Public dataset", dataset_collected:"My collection", + dataset_relate:"Related dataset", dataset_selected:"Selected dataset file", dataset_ok:"OK", dataset_not_equal_file:"Cannot select a data file with the same name.", From c9012804b511c5ca8fe0fa5f32ffde54474b509f Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 24 Aug 2022 16:36:14 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 2 ++ options/locale/locale_zh-CN.ini | 1 + templates/custom/select_dataset_train.tmpl | 20 +++++++++---------- .../js/components/dataset/selectDataset.vue | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index db79287cb..38135fcbd 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -957,6 +957,8 @@ linked_dataset=Linked Dataset unfavorite=Unfavorite favorite=Favorite disassociate=Disassociate +benchmark_dataset_tip=Note: first use the dataset function to upload the model, and then select the model from the dataset list. + [repo] owner = Owner repo_name = Repository Name diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 2808ae6ad..31687f20e 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -963,6 +963,7 @@ linked_dataset=关联数据集 unfavorite=取消收藏 favorite=收藏 disassociate=取消关联 +benchmark_dataset_tip=说明：先使用数据集功能上传模型，然后从数据集列表选模型。 [repo] owner=拥有者 diff --git a/templates/custom/select_dataset_train.tmpl b/templates/custom/select_dataset_train.tmpl index d7dbb055a..caa8f46f9 100755 --- a/templates/custom/select_dataset_train.tmpl +++ b/templates/custom/select_dataset_train.tmpl @@ -15,7 +15,7 @@ {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}} {{if .benchmarkMode}} - 说明：先使用数据集功能上传模型，然后从数据集列表选模型。 + {{.i18n.Tr "dataset.benchmark_dataset_tip"}} {{end}}
@@ -49,13 +49,13 @@ 解压中 + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_stared"}} 解压失败 + data-tooltip="{{$.i18n.Tr "dataset.unzip_failed"}}" data-inverted="" + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_failed"}}
@@ -85,13 +85,13 @@ 解压中 + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_stared"}} 解压失败 + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_failed"}}
@@ -120,13 +120,13 @@ 解压中 + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_stared"}} 解压失败 + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_failed"}} @@ -155,13 +155,13 @@ 解压中 + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_stared"}} 解压失败 + data-variation="mini" data-position="left center">{{$.i18n.Tr "dataset.unzip_failed"}} diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index 7f7c7faee..dbfa39340 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -666,10 +666,10 @@ export default { }) ) { this.$refs[data.ref].setChecked(data.id, false, false); - this.$message.warning(i18n.dataset_not_equal_file); + this.$message.warning(this.i18n.dataset_not_equal_file); } else if (this.selectDatasetArray.length === 5) { this.$refs[data.ref].setChecked(data.id, false, false); - this.$message.error(i18n.dataset_most); + this.$message.error(this.i18n.dataset_most); } else { this.selectDatasetArray.push(data); }