From f75815e4fbe2b99bced59ada21f4d7e02c7db08a Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Fri, 16 Jul 2021 16:58:36 +0800
Subject: [PATCH]  * Finish task #40305.

---
 module/custom/js/mode.js         | 4 ++--
 module/custom/lang/de.php        | 2 +-
 module/custom/lang/en.php        | 2 +-
 module/custom/lang/fr.php        | 2 +-
 module/custom/lang/vi.php        | 2 +-
 module/custom/view/mode.html.php | 4 ++--
 module/upgrade/lang/en.php       | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js
index cd8b86f050..b24c0ac56f 100644
--- a/module/custom/js/mode.js
+++ b/module/custom/js/mode.js
@@ -3,7 +3,7 @@ $(function()
     $('[name=mode]').change(function()
     {
         var mode = $(this).val();
-        if(mode == 'classic') $('#modeTips').html(newTips);
-        if(mode == 'new')     $('#modeTips').html(classicTips);
+        if(mode == 'new')     $('#modeTips').html(newTips);
+        if(mode == 'classic') $('#modeTips').html(classicTips);
     })
 })
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index db72011108..2a0dbef906 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -216,7 +216,7 @@ $lang->custom->workingList['full'] = 'Full Management of Dev';
 $lang->custom->menuTip          = 'Click to show/hide navigation bar. Drag to swtich display order.';
 $lang->custom->saveFail         = 'Failed to save!';
 $lang->custom->page             = ' Page';
-$lang->custom->changeClassicTip = 'The module of Program will be hidden, if you switch to Version 12.5.3 and below.';
+$lang->custom->changeClassicTip = 'The Program module will be hidden, if you switch to the classic mode.';
 
 $lang->custom->scoreStatus[1] = 'On';
 $lang->custom->scoreStatus[0] = 'Off';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 7c65bcb6f3..ade50a8647 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -216,7 +216,7 @@ $lang->custom->workingList['full'] = 'Application Lifecycle Management';
 $lang->custom->menuTip          = 'Click to show/hide the menu. Drag to switch display order.';
 $lang->custom->saveFail         = 'Failed to save!';
 $lang->custom->page             = ' Page';
-$lang->custom->changeClassicTip = 'The module of Program will be hidden, if you switch to Version 12.5.3 and below.';
+$lang->custom->changeClassicTip = 'The Program module will be hidden, if you switch to the classic mode.';
 
 $lang->custom->scoreStatus[1] = 'On';
 $lang->custom->scoreStatus[0] = 'Off';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index f74560e31c..bf14392a75 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -216,7 +216,7 @@ $lang->custom->workingList['full'] = 'Application Lifecycle Management';
 $lang->custom->menuTip          = "Cliquez pour montrer/cacher le menu. Déplacez pour changer l'ordre d'affichage.";
 $lang->custom->saveFail         = 'Echec de la sauvegarde !';
 $lang->custom->page             = ' Page';
-$lang->custom->changeClassicTip = 'The module of Program will be hidden, if you switch to Version 12.5.3 and below.';
+$lang->custom->changeClassicTip = 'The Program module will be hidden, if you switch to the classic mode.';
 
 $lang->custom->scoreStatus[1] = 'On';
 $lang->custom->scoreStatus[0] = 'Off';
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index f36f616fc4..3db2bbe941 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -216,7 +216,7 @@ $lang->custom->workingList['full']      = 'Quản lý vòng đời ứng dụng'
 $lang->custom->menuTip          = 'Click để hiện/ẩn menu. Kéo thả để chuyển vị trí hiển thị.';
 $lang->custom->saveFail         = 'Lưu thất bại!';
 $lang->custom->page             = '';
-$lang->custom->changeClassicTip = 'The module of Program will be hidden, if you switch to Version 12.5.3 and below.';
+$lang->custom->changeClassicTip = 'The Program module will be hidden, if you switch to the classic mode.';
 
 $lang->custom->scoreStatus[1] = 'On';
 $lang->custom->scoreStatus[0] = 'Off';
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index d78ff4990d..bb1077a87d 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -29,12 +29,12 @@
             <label class="radio-inline"><input type="radio" name="mode" value="classic" <?php echo $mode == 'classic'? "checked='checked'" : ''; echo $isDisabled;?> id="modeclassic"><?php echo $lang->upgrade->to15Mode['classic'];?></label>
             <label class="radio-inline"><input type="radio" name="mode" value="new" <?php echo $mode == 'new'? "checked='checked'" : ''; echo $isDisabled;?> id="modenew"><?php echo $lang->upgrade->to15Mode['new'];?></label>
           </p>
-          <p class='text-info' id='modeTips'><?php echo $mode == 'new' ? $lang->custom->changeClassicTip : $lang->upgrade->selectedModeTips['new'];?></p>
+          <p class='text-info' id='modeTips'><?php echo $mode == 'classic' ? $lang->custom->changeClassicTip : $lang->upgrade->selectedModeTips['new'];?></p>
         </td>
       </tr>
       <tr>
         <td></td>
-        <td><?php echo html::submitButton($lang->custom->switch, $changedMode == 'yes' ? 'disabled' : '');?></td>
+        <td><?php if($changedMode != 'yes') echo html::submitButton($lang->custom->switch);?></td>
       </tr>
     </table>
   </form>
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index f6eb4a9e28..5dc38f73b8 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -86,8 +86,8 @@ $lang->upgrade->mergeProgramDesc = <<<EOD
 <p>You can set {$lang->projectCommon}s as one new project.</p>
 EOD;
 
-$lang->upgrade->to15Mode['classic'] = 'Keep the old version';
-$lang->upgrade->to15Mode['new']     = 'New program management mode';
+$lang->upgrade->to15Mode['classic'] = 'Keep the classic mode';
+$lang->upgrade->to15Mode['new']     = 'Use the program mode';
 
 $lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.';
 $lang->upgrade->selectedModeTips['new']     = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.';