From 698b69ebd2f2c9bd1412c5739a314eeabdb5398c Mon Sep 17 00:00:00 2001
From: gujunling <34835140+gujunling@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:21:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=B6cron=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91=E6=9C=89=E8=AF=AF?=
 =?UTF-8?q?=20#1403=20(#1404)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 创建分发计划时cron表达式的英文翻译有误 #1403

* fix: 补充corn表达式的中文翻译更改 #1403
---
 .../src/components/Cron/index.vue             | 22 +++++++++----------
 src/frontend/devops-repository/src/main.js    |  3 +++
 src/frontend/locale/repository/en-US.json     | 11 ++++++++--
 src/frontend/locale/repository/zh-CN.json     | 14 ++++++------
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/frontend/devops-repository/src/components/Cron/index.vue b/src/frontend/devops-repository/src/components/Cron/index.vue
index a057c5153d..dd3850345a 100644
--- a/src/frontend/devops-repository/src/components/Cron/index.vue
+++ b/src/frontend/devops-repository/src/components/Cron/index.vue
@@ -4,7 +4,7 @@
             <bk-input class="cron-display" :value="value" readonly="readonly"></bk-input>
             <Icon class="cron-icon" name="cron" size="32" />
         </div>
-        <div v-if="showMain" class="cron-main">
+        <div v-if="showMain" class="cron-main" :style="{ 'width': `${currentLanguage === 'zh-cn' ? 490 : 590}px` }">
             <bk-radio-group style="display:flex;" v-model="mode">
                 <bk-radio value="manual">{{ $t('manualInput')}}</bk-radio>
                 <bk-radio value="ui">{{ $t('autoEdit') }}</bk-radio>
@@ -28,14 +28,14 @@
                             <span class="mr20">{{ $t(`cron.${type}`, [$t(`cron.${tab === 'week' ? 'day' : tab}`)]) }}</span>
                             <template v-if="type === 'interval' && cron[tab].type === 'interval'">
                                 <span>{{ $t('cron.from') }}</span>
-                                <bk-select style="width: 90px;margin: 0 5px;"
+                                <bk-select style="width: 100px;margin: 0 5px;"
                                     v-model="cron[tab][type][0]"
                                     @change="uiChange"
                                     @click.native.stop.prevent="() => {}">
                                     <bk-option
                                         v-for="option in cron[tab].enumerationList.map(v => ({
                                             id: v,
-                                            name: tab === 'week' ? $t(`cron.${tab}`) + $t(`cron.${v}`) : v + $t(`cron.${tab}`)
+                                            name: tab === 'week' ? $t(`cron.${v}`) : v + $t('space') + $t(`cron.${tab}`)
                                         }))"
                                         :key="option.id"
                                         :id="option.id"
@@ -43,14 +43,14 @@
                                     </bk-option>
                                 </bk-select>
                                 <span>{{ $t('cron.to') }}</span>
-                                <bk-select style="width: 90px;margin: 0 5px;"
+                                <bk-select style="width: 100px;margin: 0 5px;"
                                     v-model="cron[tab][type][1]"
                                     @change="uiChange"
                                     @click.native.stop.prevent="() => {}">
                                     <bk-option
                                         v-for="option in cron[tab].enumerationList.map(v => ({
                                             id: v,
-                                            name: tab === 'week' ? $t(`cron.${tab}`) + $t(`cron.${v}`) : v + $t(`cron.${tab}`)
+                                            name: tab === 'week' ? $t(`cron.${v}`) : v + $t('space') + $t(`cron.${tab}`)
                                         }))"
                                         :key="option.id"
                                         :id="option.id"
@@ -60,14 +60,14 @@
                                 <span>{{ $t('intervalMsg') }}</span>
                             </template>
                             <template v-else-if="type === 'circle' && cron[tab].type === 'circle' && tab !== 'year'">
-                                <bk-select style="width: 90px;margin: 0 5px;"
+                                <bk-select style="width: 108px;margin: 0 5px;"
                                     v-model="cron[tab][type][0]"
                                     @change="uiChange"
                                     @click.native.stop.prevent="() => {}">
                                     <bk-option
                                         v-for="option in cron[tab].enumerationList.map(v => ({
                                             id: v,
-                                            name: tab === 'week' ? $t(`cron.${tab}`) + $t(`cron.${v}`) : v + $t(`cron.${tab}`)
+                                            name: tab === 'week' ? $t(`cron.${v}`) : v + $t('space') + $t(`cron.${tab}`)
                                         }))"
                                         :key="option.id"
                                         :id="option.id"
@@ -75,14 +75,14 @@
                                     </bk-option>
                                 </bk-select>
                                 <span>{{ $t('circleMsg1') }}</span>
-                                <bk-select style="width: 90px;margin: 0 5px;"
+                                <bk-select style="width: 100px;margin: 0 5px;"
                                     v-model="cron[tab][type][1]"
                                     @change="uiChange"
                                     @click.native.stop.prevent="() => {}">
                                     <bk-option
                                         v-for="option in cron[tab].enumerationList.map(v => ({
                                             id: v,
-                                            name: v + $t(`cron.${tab === 'week' ? 'day' : tab}`)
+                                            name: v + $t('space') + $t(`cron.${tab === 'week' ? 'day' : tab}`)
                                         }))"
                                         :key="option.id"
                                         :id="option.id"
@@ -93,7 +93,7 @@
                             </template>
                             <template v-else-if="type === 'enumeration' && cron[tab].type === 'enumeration' && tab !== 'year'">
                                 <bk-tag-input
-                                    style="width:400px"
+                                    style="width:300px"
                                     v-model="cron[tab][type]"
                                     :allow-create="tab === 'year'"
                                     trigger="focus"
@@ -260,7 +260,7 @@
     }
     .cron-main {
         position: absolute;
-        width: 580px;
+        // width: 580px;
         right: 0px;
         top: 35px;
         padding: 20px;
diff --git a/src/frontend/devops-repository/src/main.js b/src/frontend/devops-repository/src/main.js
index 06a2189cb6..40c757a85a 100644
--- a/src/frontend/devops-repository/src/main.js
+++ b/src/frontend/devops-repository/src/main.js
@@ -9,6 +9,7 @@ import CanwayDialog from '@repository/components/CanwayDialog'
 import EmptyData from '@repository/components/EmptyData'
 import createLocale from '@locale'
 import { throttleMessage } from '@repository/utils'
+import cookies from 'js-cookie'
 
 const { i18n, setLocale } = createLocale(require.context('@locale/repository/', false, /\.json$/))
 
@@ -18,6 +19,8 @@ Vue.component('EmptyData', EmptyData)
 
 Vue.prototype.$setLocale = setLocale
 Vue.prototype.$bkMessage = throttleMessage(Vue.prototype.$bkMessage, 3500)
+// 全局存储当前国际化语言
+Vue.prototype.currentLanguage = cookies.get('blueking_language') || 'zh-cn'
 
 document.title = i18n.t('webTitle')
 
diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json
index b3c121f27c..e7b04e051a 100644
--- a/src/frontend/locale/repository/en-US.json
+++ b/src/frontend/locale/repository/en-US.json
@@ -173,12 +173,19 @@
         "month": "month",
         "week": "week",
         "year": "year",
-        "every": "every{0}",
+        "every": "every {0}",
         "interval": "interval",
         "circle": "circle",
         "enumeration": "enumeration",
         "from": "from",
-        "to": "to"
+        "to": "to",
+        "1": "Sunday",
+        "2": "Monday",
+        "3": "Tuesday",
+        "4": "Wednesday",
+        "5": "Thursday",
+        "6": "Friday",
+        "7": "Saturday"
     },
     "mobileDownload": "Mobile Download",
     "webDownload": "Web Download",
diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json
index 61e80e3c3f..2519f0d233 100644
--- a/src/frontend/locale/repository/zh-CN.json
+++ b/src/frontend/locale/repository/zh-CN.json
@@ -183,13 +183,13 @@
         "enumeration": "枚举",
         "from": "从",
         "to": "到",
-        "1": "日",
-        "2": "一",
-        "3": "二",
-        "4": "三",
-        "5": "四",
-        "6": "五",
-        "7": "六"
+        "1": "周日",
+        "2": "周一",
+        "3": "周二",
+        "4": "周三",
+        "5": "周四",
+        "6": "周五",
+        "7": "周六"
     },
     "mobileDownload": "移动端下载限制",
     "webDownload": "Web端下载限制",