From 5e88a396458aabcecdbdfd73efe2db8db1fac5dd Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 28 Jan 2021 11:15:54 +0800
Subject: [PATCH] * Fix client lang.

---
 module/common/lang/de.php       | 2 +-
 module/common/lang/en.php       | 2 +-
 module/common/lang/fr.php       | 2 +-
 module/common/lang/vi.php       | 2 +-
 module/common/lang/zh-cn.php    | 2 +-
 module/common/model.php         | 2 +-
 module/upgrade/lang/version.php | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index ce74c31f73..8db0490c87 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
 $lang->colorPicker->errorTip = 'Not a valid color value';
 
 $lang->downNotify     = "Download Desktop Notification";
-$lang->client         = "Desktop";
+$lang->clientName     = "Desktop";
 $lang->downloadClient = "Download ZenTao Desktop";
 $lang->clientHelp     = "Client Help";
 $lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c3a38d67c0..1ea26038d8 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
 $lang->colorPicker->errorTip = 'Not a valid color value';
 
 $lang->downNotify     = "Download Desktop Notification";
-$lang->client         = "Desktop";
+$lang->clientName     = "Desktop";
 $lang->downloadClient = "Download ZenTao Desktop";
 $lang->clientHelp     = "Client Help";
 $lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 39a914d898..f3f7a53086 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
 $lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide";
 
 $lang->downNotify     = "Télécharger la notification sur le bureau";
-$lang->client         = "Desktop";
+$lang->clientName     = "Desktop";
 $lang->downloadClient = "Télécharger ZenTao Desktop";
 $lang->clientHelp     = "Aide Client";
 $lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index cd1b2ff1dc..5becbb2e57 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
 $lang->colorPicker->errorTip = 'Not a valid color value';
 
 $lang->downNotify     = "Download Desktop Notification";
-$lang->client         = "Desktop";
+$lang->clientName     = "Desktop";
 $lang->downloadClient = "Download ZenTao Desktop";
 $lang->clientHelp     = "Client Help";
 $lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index a50daf1166..3bf7fe60af 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
 $lang->colorPicker->errorTip = '不是有效的颜色值';
 
 $lang->downNotify     = "下载桌面提醒";
-$lang->client         = "客户端";
+$lang->clientName     = "客户端";
 $lang->downloadClient = "下载客户端";
 $lang->clientHelp     = "客户端使用说明";
 $lang->clientHelpLink = "http://www.zentao.net/book/zentaopmshelp/302.html#2";
diff --git a/module/common/model.php b/module/common/model.php
index e6cb0b99fd..35330ae9a5 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -950,7 +950,7 @@ class commonModel extends model
         if(isset($config->xxserver->installed) and $config->xuanxuan->turnon)
         {
             echo "<li class='dropdown-submenu'>";
-            echo "<a href='javascript:;'>" . "<i class='icon icon-download'></i> " . $lang->client . "</a><ul class='dropdown-menu pull-left'>";
+            echo "<a href='javascript:;'>" . "<i class='icon icon-download'></i> " . $lang->clientName . "</a><ul class='dropdown-menu pull-left'>";
             echo '<li>' . html::a(helper::createLink('misc', 'downloadClient', '', '', true), $lang->downloadClient, '', "title='$lang->downloadClient' class='iframe text-ellipsis' data-width='600'") . '</li>';
             echo '<li>' . html::a($lang->clientHelpLink, $lang->clientHelp, '', "title='$lang->clientHelp' target='_blank'") . '</li>';
             echo '</ul></li>';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index eb9082d973..9fe580c340 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -134,3 +134,4 @@ $lang->upgrade->fromVersions['12_5_1']      = '12.5.1';
 $lang->upgrade->fromVersions['20_0_alpha1'] = '20.0.alpha1';
 $lang->upgrade->fromVersions['20_0_beta1']  = '20.0.beta1';
 $lang->upgrade->fromVersions['20_0_beta2']  = '20.0.beta2';
+$lang->upgrade->fromVersions['20_0_beta3']  = '20.0.beta3';