From e30331c50860d2883251a379ed55b5d08722cce5 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 May 2019 14:47:56 +0800 Subject: [PATCH] no message Former-commit-id: a3fa388a4cef3e4ad7a51dedf246b43bb1c1cdfe [formerly 4edd48fc7555dcf756f4e0acac2a6cda1ccc9337] [formerly a3fa388a4cef3e4ad7a51dedf246b43bb1c1cdfe [formerly 4edd48fc7555dcf756f4e0acac2a6cda1ccc9337] [formerly a3fa388a4cef3e4ad7a51dedf246b43bb1c1cdfe [formerly 4edd48fc7555dcf756f4e0acac2a6cda1ccc9337] [formerly 4edd48fc7555dcf756f4e0acac2a6cda1ccc9337 [formerly dbc3f3fda96c074eef8990887d9d884bfba85cd9 [formerly 6dca5d03251c31be5eaf640ca4627f9212b047c6]]]]] Former-commit-id: a9ee684f33a3f3b50b55ead90afcdde1c4e4e99f Former-commit-id: feecb25a87de9a593762832c219ac15dd3e0ca39 Former-commit-id: ec0ca2f8f75148ac4e349f0a31c9b4da74d2f6ad [formerly 91d50745860d48977f45ae700108251543acd934] Former-commit-id: 9434846e773444be037975f898fdceb5f97226ec Former-commit-id: ae766ee4d10267e9f806ca1abc5b8f3e3aa80d98 Former-commit-id: fb6cb4af2e62845d5c9d68759d2e8ca0e5469a35 Former-commit-id: cb67c6deeb83028d87fc42036a59427843ad7667 Former-commit-id: ec630b318355081f0064342d898ea69c9b3a5c9c --- locales.babel.REMOVED.git-id | 2 +- src/locales/en.json | 28 ++++++++++++++++++---------- src/locales/ja.json | 28 ++++++++++++++++++---------- src/locales/zh-chs.json | 28 ++++++++++++++++++---------- src/locales/zh-cht.json | 28 ++++++++++++++++++---------- src/views/system/log/index.vue | 8 ++++---- 6 files changed, 77 insertions(+), 45 deletions(-) diff --git a/locales.babel.REMOVED.git-id b/locales.babel.REMOVED.git-id index 717b4d1d..d5b926e9 100644 --- a/locales.babel.REMOVED.git-id +++ b/locales.babel.REMOVED.git-id @@ -1 +1 @@ -88eed29c0d330f88fa9db7630c40dc370c1240cc \ No newline at end of file +961b48ccb8ed6a26747b373e793852ded4210ed3 \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index eef99523..d06a86a8 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -3,6 +3,24 @@ "error-message": { "form-not-valid": "Form Check Failure" }, + "notify": { + "special": { + "upload": { + "error": { + "message": "", + "title": "" + }, + "start": { + "message": "", + "title": "" + }, + "success": { + "message": "", + "title": "" + } + } + } + }, "rules": { "required": "{name} is required" } @@ -67,16 +85,6 @@ "more": { "message": "", "title": "" - }, - "upload": { - "start": { - "message": "", - "title": "" - }, - "success": { - "message": "", - "title": "" - } } }, "table": { diff --git a/src/locales/ja.json b/src/locales/ja.json index f556a512..62a64fa1 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -3,6 +3,24 @@ "error-message": { "form-not-valid": "フォームの検証に失敗しました" }, + "notify": { + "special": { + "upload": { + "error": { + "message": "", + "title": "" + }, + "start": { + "message": "", + "title": "" + }, + "success": { + "message": "", + "title": "" + } + } + } + }, "rules": { "required": "を入力してください {name}" } @@ -67,16 +85,6 @@ "more": { "message": "", "title": "" - }, - "upload": { - "start": { - "message": "", - "title": "" - }, - "success": { - "message": "", - "title": "" - } } }, "table": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index 11629df5..af720f5f 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -3,6 +3,24 @@ "error-message": { "form-not-valid": "表单校验失败" }, + "notify": { + "special": { + "upload": { + "error": { + "message": "数据上传失败", + "title": "上传失败" + }, + "start": { + "message": "正在上传数据,请稍后", + "title": "开始上传" + }, + "success": { + "message": "数据上传成功", + "title": "上传成功" + } + } + } + }, "rules": { "required": "请输入{name}" } @@ -67,16 +85,6 @@ "more": { "message": "完整的日志内容已经打印到控制台", "title": "日志详情" - }, - "upload": { - "start": { - "message": "开始上传 {number} 条日志", - "title": "日志上传" - }, - "success": { - "message": "上传成功", - "title": "提示" - } } }, "table": { diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index 427150fc..9cea6bec 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -3,6 +3,24 @@ "error-message": { "form-not-valid": "表單校驗失敗" }, + "notify": { + "special": { + "upload": { + "error": { + "message": "", + "title": "" + }, + "start": { + "message": "", + "title": "" + }, + "success": { + "message": "", + "title": "" + } + } + } + }, "rules": { "required": "請輸入{name}" } @@ -67,16 +85,6 @@ "more": { "message": "", "title": "" - }, - "upload": { - "start": { - "message": "", - "title": "" - }, - "success": { - "message": "", - "title": "" - } } }, "table": { diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index 7264aee0..9b7eeb27 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -104,15 +104,15 @@ export default { this.uploading = true this.$notify({ type: 'info', - title: this.$t('views.system.log.notify.upload.start.title'), - message: this.$t('views.system.log.notify.upload.start.message', { number: this.log.length }) + title: this.$t('public.notify.special.upload.start.title'), + message: this.$t('public.notify.special.upload.start.message') }) setTimeout(() => { this.uploading = false this.$notify({ type: 'success', - title: this.$t('views.system.log.notify.upload.success.title'), - message: this.$t('views.system.log.notify.upload.success.message') + title: this.$t('public.notify.special.upload.success.title'), + message: this.$t('public.notify.special.upload.success.message') }) }, 3000) }