diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4ab392d07..f1f0205e2 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -951,6 +951,11 @@ unzip_failed=Unzip Failed unzip_stared=Unzipping unzip_status=Unzip Status collection_num=Collection Nums +current_dataset=Current Dataset +linked_dataset=Linked Dataset +unfavorite=Unfavorite +favorite=Favorite +disassociate=Disassociate [repo] owner = Owner repo_name = Repository Name diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 2b69671c2..fc3aba1ac 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -957,6 +957,12 @@ unzip_failed=解压失败 unzip_stared=解压中 unzip_status=解压状态 collection_num=收藏数量 +current_dataset=当前数据集 +linked_dataset=关联数据集 +unfavorite=取消收藏 +favorite=收藏 +disassociate=取消关联 + [repo] owner=拥有者 repo_name=项目名称 diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 3dc12cf12..5577a76b6 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -157,8 +157,8 @@
- 当前数据集 - 关联数据集 + {{$.i18n.Tr "dataset.current_dataset"}} + {{$.i18n.Tr "dataset.linked_dataset"}}
@@ -169,20 +169,20 @@ {{if $.IsSigned}} {{else}} {{end}}
@@ -402,11 +402,11 @@
- 当前数据集 - 关联数据集 + {{$.i18n.Tr "dataset.current_dataset"}} + {{$.i18n.Tr "dataset.linked_dataset"}}
{{if $.CanWrite}} - 创建数据集 + {{$.i18n.Tr "dataset.new_dataset"}} {{end}}
diff --git a/templates/repo/datasets/reference.tmpl b/templates/repo/datasets/reference.tmpl index b20437c89..422a2ff8f 100644 --- a/templates/repo/datasets/reference.tmpl +++ b/templates/repo/datasets/reference.tmpl @@ -2,7 +2,7 @@
{{template "repo/header" .}} -
+
{{template "base/footer" .}} diff --git a/web_src/js/components/dataset/referenceDataset.vue b/web_src/js/components/dataset/referenceDataset.vue index 9cc966a06..c79469838 100644 --- a/web_src/js/components/dataset/referenceDataset.vue +++ b/web_src/js/components/dataset/referenceDataset.vue @@ -133,7 +133,7 @@ justify-content: center; margin: 0 1rem; " - title="引用次数" + :title="i18n.citations" >
-
还未关联过数据集
+
{{ i18n.not_link_dataset }}
- 您可以通过单击新建关联数据集按钮，将平台上公开数据集展示在这里。 + {{ i18n.no_link_dataset_tips1 }}
- 使用说明可以参考启智AI协作平台小白训练营课程 + {{ i18n.dataset_instructions_for_use + }}{{ + i18n.dataset_camp_course + }}
@@ -262,9 +262,17 @@ class="select-data-title" style="display: flex; align-items: end" > - {{ item.Title }} - + + {{ item.Title }} + + { if (res.data.Code === 0) { - this.$message.success(`取消${name}关联数据集成功！`); + this.$message.success(this.i18n.cancel_link_dataset.format(name)); let index = this.datasetList.findIndex((item) => { return item.ID === id; }); @@ -436,7 +445,7 @@ export default { } }) .catch((err) => { - this.$message.error(`取消关联数据集失败！`); + this.$message.error(this.i18n.dataset_link_failed); console.log(err); }); }, @@ -447,11 +456,15 @@ export default { changeCheckbox(checked, item) { if (this.checkList.length > this.maxReferenceNum) { this.checkList.pop(); - this.$message.error("关联超过20个数据集"); + this.$message.error( + this.i18n.dataset_over_nums.format(this.maxReferenceNum) + ); return; } if (this.checkList.length === this.maxReferenceNum && !checked) { - this.$message.error("关联超过20个数据集"); + this.$message.error( + this.i18n.dataset_over_nums.format(this.maxReferenceNum) + ); return; } if (checked) { @@ -534,7 +547,9 @@ export default { }, submitReferDataset() { if (this.checkList.length > this.maxReferenceNum) { - this.$message.error("关联超过20个数据集"); + this.$message.error( + this.i18n.dataset_over_nums.format(this.maxReferenceNum) + ); return; } let url = `${this.repoLink}/datasets/reference_datasets`; @@ -549,14 +564,14 @@ export default { .post(url, data) .then((res) => { if (res.data.Code === 0) { - this.$message.success(`关联数据集成功！`); + this.$message.success(this.i18n.dataset_link_success); this.getSelectDatasetList(); } else { this.$message.error(res.data.Message); } }) .catch((err) => { - this.$message.error(`关联数据集失败！`); + this.$message.error(this.i18n.dataset_link_failed); console.log(err); }); }, @@ -584,7 +599,7 @@ export default { } }, showFlag(val) { - if (!val) { + if (!val || this.isCurrentUrl) { document .getElementById("header-dataset") .setAttribute("href", this.repoLink + "/datasets"); @@ -603,6 +618,7 @@ export default { this.canWrite = $(".reference-dataset").data("canwrite"); this.isSigned = $(".reference-dataset").data("is-sign"); this.maxReferenceNum = $(".reference-dataset").data("max-reference-num"); + this.isCurrentUrl = $(".reference-dataset").data("address"); if (document.documentElement.attributes["lang"].nodeValue == "en-US") { this.i18n = this.$locale.US; } else { @@ -679,8 +695,9 @@ export default { font-size: 18px; color: #454545; font-weight: 700; - overflow: hidden; - text-overflow: ellipsis; + display: flex; + align-items: baseline; + max-width: 100%; } .select-data-href { text-align: right; diff --git a/web_src/js/features/datsetCate.js b/web_src/js/features/i18nVue.js similarity index 73% rename from web_src/js/features/datsetCate.js rename to web_src/js/features/i18nVue.js index d27d10f79..e649947a4 100644 --- a/web_src/js/features/datsetCate.js +++ b/web_src/js/features/i18nVue.js @@ -43,9 +43,20 @@ export const i18nVue = { favorite: "收藏", disassociate: "取消关联", public_dataset: "公开数据集", - selected_data_file: "已选数据文件", + selected_data_file: "已选数据集", sure: "确定", search_dataset: "搜数据集名称/描述...", + citations: "引用次数", + downloads: "下载次数", + not_link_dataset: "还未关联过数据集", + no_link_dataset_tips1: + "您可以通过单击新建关联数据集按钮，将平台上公开数据集展示在这里。", + dataset_instructions_for_use: "使用说明：可以参考启智AI协作平台", + dataset_camp_course: "小白训练营课程", + dataset_link_success: "关联数据集成功！", + dataset_link_failed: "关联数据集失败！", + dataset_over_nums: "关联超过?个数据集", + cancel_link_dataset: "取消?关联数据集成功！", }, US: { computer_vision: "computer vision", @@ -92,8 +103,21 @@ export const i18nVue = { favorite: "Favorite", disassociate: "Disassociate", public_dataset: "Public Dataset", - selected_data_file: "Selected Data File", - sure: "Sure", + selected_data_file: "Selected DataSets", + sure: "Ok", search_dataset: "Search dataset name/description ...", + citations: "Citations", + downloads: "Downloads", + not_link_dataset: "No datasets have been associated yet", + no_link_dataset_tips1: + "You can display public datasets on the platform here by clicking the New Linked Dataset button.", + + dataset_instructions_for_use: + "Instructions for use: You can refer to Qizhi AI Collaboration Platform ", + dataset_camp_course: "Newcomer Training Camp Course", + dataset_link_success: "Linked dataset succeeded！", + dataset_link_failed: "Linked dataset Failed！", + dataset_over_nums: "Linked over ? datasets!", + cancel_link_dataset: "Cancel ? Linked dataset succeeded!", }, }; diff --git a/web_src/js/index.js b/web_src/js/index.js index e95f627a7..cd8d7d211 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -51,7 +51,7 @@ import referenceDataset from "./components/dataset/referenceDataset.vue"; import router from "./router/index.js"; import { Message } from "element-ui"; -import { i18nVue } from "./features/datsetCate.js"; +import { i18nVue } from "./features/i18nVue.js"; Vue.use(ElementUI); Vue.prototype.$axios = axios;