From 0d988bbd6a4d28b86783ddd498654896c7a937ec Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 12 Dec 2024 23:57:50 +0800
Subject: [PATCH] pref(system): Optimize and upgrade related
 internationalization translations. (#7356)

---
 frontend/src/components/system-upgrade/index.vue | 10 ++++++----
 frontend/src/lang/modules/en.ts                  | 15 ++++++---------
 frontend/src/lang/modules/tw.ts                  |  7 ++-----
 frontend/src/lang/modules/zh.ts                  |  7 ++-----
 frontend/src/views/setting/license/index.vue     |  2 +-
 5 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/system-upgrade/index.vue b/frontend/src/components/system-upgrade/index.vue
index c399c8dc7..7665bdd4c 100644
--- a/frontend/src/components/system-upgrade/index.vue
+++ b/frontend/src/components/system-upgrade/index.vue
@@ -16,24 +16,25 @@
                 <el-divider v-if="!mobile" direction="vertical" />
             </div>
             <div class="flex flex-wrap items-center">
-                <el-link :underline="false" type="primary" @click="toLxware">
+                <el-link :underline="false" class="-ml-2" type="primary" @click="toLxware">
                     {{ $t(globalStore.isIntl || !isProductPro ? 'license.community' : 'license.pro') }}
                 </el-link>
                 <el-link :underline="false" class="version" type="primary" @click="copyText(version)">
                     {{ version }}
                 </el-link>
                 <el-badge is-dot class="-mt-0.5" v-if="version !== 'Waiting' && globalStore.hasNewVersion">
-                    <el-link :underline="false" type="primary" @click="onLoadUpgradeInfo">
-                        （{{ $t('setting.hasNewVersion') }}）
+                    <el-link class="ml-2" :underline="false" type="primary" @click="onLoadUpgradeInfo">
+                        {{ $t('commons.operate.update') }}
                     </el-link>
                 </el-badge>
                 <el-link
                     v-if="version !== 'Waiting' && !globalStore.hasNewVersion"
                     type="primary"
                     :underline="false"
+                    class="ml-2"
                     @click="onLoadUpgradeInfo"
                 >
-                    （{{ $t('setting.upgradeCheck') }}）
+                    {{ $t('commons.operate.update') }}
                 </el-link>
                 <el-tag v-if="version === 'Waiting'" round style="margin-left: 10px">
                     {{ $t('setting.upgrading') }}
@@ -200,6 +201,7 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .version {
+    margin-left: 8px;
     font-size: 14px;
     color: var(--panel-color-primary-light-4);
     text-decoration: none;
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index af3c675f0..12e9205af 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -1664,15 +1664,13 @@ const message = {
 
         upgradeHelper: 'The upgrade requires restarting the 1Panel service. Do you want to continue?',
         noUpgrade: 'It is currently the latest version',
-        upgradeCheck: 'Check for updates',
         upgradeNotes: 'Release note',
         upgradeNow: 'Upgrade now',
         source: 'Download source',
-        hasNewVersion: 'Update available',
 
         about: 'About',
         project: 'GitHub',
-        issue: 'Feedback',
+        issue: 'Issue',
         doc: 'Official document',
         star: 'Star',
         description: 'Linux Server Panel',
@@ -1693,11 +1691,10 @@ const message = {
         backupRecoverMessage: 'Please enter the compression or decompression password (leave blank to not set)',
     },
     license: {
-        community: 'Community Edition: ',
-        community2: 'Community Edition',
-        pro: 'Professional Edition: ',
-        trial: 'Trial Edition',
-        office: 'Official Edition',
+        community: 'Free',
+        pro: 'Pro',
+        trial: 'Trial',
+        office: 'Official',
         trialInfo: 'Version',
         authorizationId: 'Subscription authorization ID',
         authorizedUser: 'Authorized user',
@@ -1721,7 +1718,7 @@ const message = {
         technicalAdvice: 'Technical consultation',
         advice: 'Consultation',
         indefinitePeriod: 'Indefinite Period',
-        levelUpPro: 'Upgrade to Professional Edition',
+        levelUpPro: 'Upgrade to Pro',
         licenseSync: 'License Sync',
         knowMorePro: 'Learn More',
         closeAlert: 'The current page can be closed in the panel settings',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index 48ddb359f..ff027f5a2 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -1481,11 +1481,9 @@ const message = {
         upgrading: '正在升級中，請稍候...',
         upgradeHelper: '升級操作需要重啟 1Panel 服務，是否繼續？',
         noUpgrade: '當前已經是最新版本',
-        upgradeCheck: '檢查更新',
         upgradeNotes: '更新內容',
         upgradeNow: '立即更新',
         source: '下載源',
-        hasNewVersion: '有新版本',
 
         safe: '安全',
         bindInfo: '監聽地址',
@@ -1583,9 +1581,8 @@ const message = {
         backupRecoverMessage: '請輸入壓縮或解壓縮密碼（留空則不設定）',
     },
     license: {
-        community: '社區版：',
-        community2: '社區版',
-        pro: '專業版：',
+        community: '社區版',
+        pro: '專業版',
         trial: '試用版',
         office: '正式版',
         trialInfo: '版本',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 345818789..a5d98a8dd 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -1482,11 +1482,9 @@ const message = {
         upgrading: '正在升级中，请稍候...',
         upgradeHelper: '升级操作需要重启 1Panel 服务，是否继续？',
         noUpgrade: '当前已经是最新版本',
-        upgradeCheck: '检查更新',
         upgradeNotes: '更新内容',
         upgradeNow: '立即更新',
         source: '下载源',
-        hasNewVersion: '有新版本',
 
         safe: '安全',
         bindInfo: '监听地址',
@@ -1583,9 +1581,8 @@ const message = {
         backupRecoverMessage: '请输入压缩或解压缩密码（留空则不设置）',
     },
     license: {
-        community: '社区版：',
-        community2: '社区版',
-        pro: '专业版：',
+        community: '社区版',
+        pro: '专业版',
         trial: '试用版',
         office: '正式版',
         trialInfo: '版本',
diff --git a/frontend/src/views/setting/license/index.vue b/frontend/src/views/setting/license/index.vue
index 50796c951..0d0e5a187 100644
--- a/frontend/src/views/setting/license/index.vue
+++ b/frontend/src/views/setting/license/index.vue
@@ -66,7 +66,7 @@
                                             <span>{{ $t('setting.license') }}</span>
                                         </el-col>
                                         <el-col :span="6">
-                                            <span>{{ $t('license.community2') }}</span>
+                                            <span>{{ $t('license.community') }}</span>
                                         </el-col>
                                     </el-row>
                                 </div>