From 13265518d6bc1b57bfefcf44f7b4df9b78bedb59 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 11 May 2016 13:39:15 +0800 Subject: [PATCH] * change for upgrade and zh-tw lang. --- VERSION | 2 +- config/config.php | 2 +- module/bug/lang/zh-tw.php | 16 +++++++++------- module/common/lang/zh-tw.php | 6 +++--- module/tutorial/lang/zh-tw.php | 1 + module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/lang/zh-tw.php | 1 + module/upgrade/model.php | 2 ++ 9 files changed, 20 insertions(+), 12 deletions(-) diff --git a/VERSION b/VERSION index 98d8a4eb67..9781f30e36 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.beta +8.2.stable diff --git a/config/config.php b/config/config.php index 0944db62df..1e4ff3bfa3 100644 --- a/config/config.php +++ b/config/config.php @@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '8.2.beta'; // The version of zentaopms. Don't change it. +$config->version = '8.2'; // The version of zentaopms. Don't change it. $config->charset = 'UTF-8'; // The charset of zentaopms. $config->cookieLife = time() + 2592000; // The cookie life time. $config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 391311d585..7300a45494 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -120,13 +120,15 @@ $lang->bug->allUsers = '所有用戶'; $lang->bug->allBuilds = '所有'; /* legend列表。*/ -$lang->bug->legendBasicInfo = '基本信息'; -$lang->bug->legendAttatch = '附件'; -$lang->bug->legendPrjStoryTask = $lang->projectCommon . '/需求/任務'; -$lang->bug->legendSteps = '重現步驟'; -$lang->bug->legendComment = '備註'; -$lang->bug->legendLife = 'BUG的一生'; -$lang->bug->legendMisc = '其他相關'; +$lang->bug->legendBasicInfo = '基本信息'; +$lang->bug->legendAttatch = '附件'; +$lang->bug->legendPrjStoryTask = $lang->projectCommon . '/需求/任務'; +$lang->bug->lblTypeAndSeverity = '類型/嚴重程度'; +$lang->bug->lblSystemBrowserAndHardware = '系統/瀏覽器'; +$lang->bug->legendSteps = '重現步驟'; +$lang->bug->legendComment = '備註'; +$lang->bug->legendLife = 'BUG的一生'; +$lang->bug->legendMisc = '其他相關'; /* 功能按鈕。*/ $lang->bug->buttonConfirm = '確認'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 9d1f3d2233..c53243652d 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -65,7 +65,7 @@ $lang->duplicate = '已有相同標題的%s'; $lang->ipLimited = "抱歉，管理員限制當前IP登錄，請聯繫管理員解除限制。"; $lang->unfold = '+'; $lang->fold = '-'; -$lang->homepage = '設為主頁'; +$lang->homepage = '設為模組首頁'; $lang->tutorial = '新手教程'; $lang->changeLog = '修改日誌'; $lang->manual = '手冊'; @@ -190,7 +190,7 @@ $lang->product->menu->view = array('link' => '概況|product|view|productID=% $lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; $lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); $lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); -$lang->product->menu->index = array('link' => "產品主頁|product|index|locate=no", 'float' => 'right'); +$lang->product->menu->index = array('link' => "{$lang->productCommon}主頁|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); @@ -219,7 +219,7 @@ $lang->project->menu->product = $lang->productCommon . '|project|manageproduct $lang->project->menu->view = array('link' => '概況|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); $lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); -$lang->project->menu->index = array('link' => "項目主頁|project|index|locate=no", 'float' => 'right'); +$lang->project->menu->index = array('link' => "{$lang->projectCommon}主頁|project|index|locate=no", 'float' => 'right'); $lang->task = new stdclass(); $lang->build = new stdclass(); diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php index fb896c389d..1110ef1baa 100644 --- a/module/tutorial/lang/zh-tw.php +++ b/module/tutorial/lang/zh-tw.php @@ -31,6 +31,7 @@ $lang->tutorial->congratulateTask = '恭喜，你完成了任務 【tutorial->serverErrorTip = '發生了一些錯誤。'; $lang->tutorial->ajaxSetError = '必須指定已完成的任務，如果要重置任務，請設置值為空。'; $lang->tutorial->novice = "您可能初次使用禪道，是否進入新手教程"; +$lang->tutorial->dataNotSave = "教程任務中，數據不會保存。"; $lang->tutorial->tasks = array(); diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index e81128534c..0c6c548881 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -100,3 +100,4 @@ $lang->upgrade->fromVersions['8_0'] = '8.0'; $lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; $lang->upgrade->fromVersions['8_1'] = '8.1'; $lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; +$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index b3911e36fc..2c522e01fc 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -100,3 +100,4 @@ $lang->upgrade->fromVersions['8_0'] = '8.0'; $lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; $lang->upgrade->fromVersions['8_1'] = '8.1'; $lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; +$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index a9dfd1f877..349794d78f 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -100,3 +100,4 @@ $lang->upgrade->fromVersions['8_0'] = '8.0'; $lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; $lang->upgrade->fromVersions['8_1'] = '8.1'; $lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; +$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index f9d0945309..ca5a20d630 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -140,6 +140,7 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('8.1.3')); $this->addPriv8_2_beta(); $this->adjustConfigSectionAndKey(); + case '8_2_beta': default: if(!$this->isError()) $this->setting->updateVersion($this->config->version); } @@ -216,6 +217,7 @@ class upgradeModel extends model case '8_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.0.1')); case '8_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.1')); case '8_1_3': $confirmContent .= file_get_contents($this->getUpgradeFile('8.1.3')); + case '8_2_beta': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }