From 06752d4cb3f528633b9333bfc24575e19a6673ce Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 26 Sep 2017 13:45:32 +0800 Subject: [PATCH] * add new version and upgrade. --- VERSION | 2 +- config/config.php | 2 +- module/common/lang/zh-tw.php | 2 +- module/custom/lang/en.php | 9 +++++---- module/custom/lang/zh-tw.php | 15 ++++++++++----- module/install/lang/en.php | 10 ++++++++++ module/install/lang/zh-tw.php | 10 ++++++++++ module/my/lang/zh-tw.php | 1 + module/story/lang/zh-tw.php | 2 +- module/testcase/lang/zh-tw.php | 10 +++++----- module/testreport/lang/zh-tw.php | 2 +- module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/lang/zh-tw.php | 1 + module/upgrade/model.php | 3 +++ module/user/lang/zh-tw.php | 32 ++++++++++++++++---------------- 16 files changed, 68 insertions(+), 35 deletions(-) diff --git a/VERSION b/VERSION index 5992115771..9c50fbf5d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.5.stable +9.5.1 diff --git a/config/config.php b/config/config.php index b1121707b5..b1dbeabb44 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '9.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '9.5.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。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/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 7c7ac5506e..ec34be2292 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -478,7 +478,7 @@ $lang->datepicker->dpText->TEXT_CLOSE = '關閉'; $lang->datepicker->dpText->TEXT_DATE = '選擇時間段'; $lang->datepicker->dpText->TEXT_CHOOSE_DATE = '選擇日期'; -$lang->datepicker->dayNames = array('日', '一', '二', '三', '四', '五', '六'); +$lang->datepicker->dayNames = array('星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'); $lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五', '六'); $lang->datepicker->monthNames = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'); diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 0110fc718f..0e45826aab 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -91,10 +91,11 @@ $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to enter Project Homepage?"; $lang->custom->notice->indexPage['qa'] = "ZenTao 8.2+ has Testing Homepage. Do you want to enter Testing Homepage?"; -$lang->custom->storyReview = 'Review'; -$lang->custom->forceReview = 'Review Required'; -$lang->custom->reviewList[1] = 'On'; -$lang->custom->reviewList[0] = 'Off'; +$lang->custom->storyReview = 'Review'; +$lang->custom->forceReview = 'Review Required'; +$lang->custom->forceNotReview = 'Need not review'; +$lang->custom->reviewList[1] = 'On'; +$lang->custom->reviewList[0] = 'Off'; $lang->custom->deletedList[1] = 'Show'; $lang->custom->deletedList[0] = 'Not Show'; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index a2a143e05e..1b0a627055 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -69,6 +69,7 @@ $lang->custom->todo->fields['statusList'] = '狀態'; $lang->custom->user = new stdClass(); $lang->custom->user->fields['roleList'] = '職位'; $lang->custom->user->fields['statusList'] = '狀態'; +$lang->custom->user->fields['deleted'] = '列出已刪除用戶'; $lang->custom->block->fields['closed'] = '關閉的區塊'; @@ -81,8 +82,8 @@ $lang->custom->notice = new stdclass(); $lang->custom->notice->userRole = '鍵的長度必須小於20個字元！'; $lang->custom->notice->canNotAdd = '該項參與運算，不提供自定義添加功能'; $lang->custom->notice->forceReview = "指定人提交的%s必須評審。"; -$lang->custom->notice->longlife = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。'; $lang->custom->notice->forceNotReview = "指定人提交的%s不需要評審。"; +$lang->custom->notice->longlife = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。'; $lang->custom->notice->priListKey = '優先順序的鍵應當為數字！'; $lang->custom->notice->keyList = '鍵值應當為英文或數字'; $lang->custom->notice->severityListKey = 'Bug嚴重程度的鍵應當為數字！'; @@ -90,10 +91,14 @@ $lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主 $lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？"; $lang->custom->notice->indexPage['qa'] = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？"; -$lang->custom->storyReview = '評審流程'; -$lang->custom->forceReview = '強制評審'; -$lang->custom->reviewList[1] = '開啟'; -$lang->custom->reviewList[0] = '關閉'; +$lang->custom->storyReview = '評審流程'; +$lang->custom->forceReview = '強制評審'; +$lang->custom->forceNotReview = '不需要評審'; +$lang->custom->reviewList[1] = '開啟'; +$lang->custom->reviewList[0] = '關閉'; + +$lang->custom->deletedList[1] = '列出'; +$lang->custom->deletedList[0] = '不列出'; $lang->custom->workingHours = '每天可用工時'; $lang->custom->weekend = '休息日'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 78305d7c53..afd65da09d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -195,3 +195,13 @@ $lang->install->zdoo->desc = <<An integrated and collaborative platform EOD; +$lang->install->xuanxuan = new stdclass(); +$lang->install->xuanxuan->name = 'Xuanxuan IM'; +$lang->install->xuanxuan->desc = << +
  • lightweight and easy to deploy
    • +
  • truly complete cross platform solutions
    • +
  • Based on Html5, the beautiful
    • +
  • Open architecture
    • + +EOD; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 4a8e772cd7..af8532033b 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -195,3 +195,13 @@ $lang->install->zdoo->desc = <<提供一體化管理平台 EOD; +$lang->install->xuanxuan = new stdclass(); +$lang->install->xuanxuan->name = '喧喧即時聊天軟件'; +$lang->install->xuanxuan->desc = << +
  • 輕：輕量級架構，容易部署
    • +
  • 跨：真正完整跨平台解決方案
    • +
  • 美：基于Html5開發，界面美觀
    • +
  • 開：開放架構，方便二開整合
    • + +EOD; diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index 826556700f..6ee5ca897a 100644 --- a/module/my/lang/zh-tw.php +++ b/module/my/lang/zh-tw.php @@ -17,6 +17,7 @@ $lang->my->changePassword = '修改密碼'; $lang->my->unbind = '解除然之綁定'; $lang->my->manageContacts = '維護聯繫人'; $lang->my->deleteContacts = '刪除聯繫人'; +$lang->my->limited = '受限操作(只能編輯與自己相關的內容)'; $lang->my->taskMenu = new stdclass(); $lang->my->taskMenu->assignedToMe = '指派給我'; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index f439ea47f6..e79851cc16 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -90,7 +90,7 @@ $lang->story->keywords = '關鍵詞'; $lang->story->newStory = '繼續添加需求'; $lang->story->colorTag = '顏色標籤'; $lang->story->files = '附件'; -$lang->story->copy = "復制需求"; +$lang->story->copy = "複製需求"; $lang->story->ditto = '同上'; $lang->story->dittoNotice = '該需求與上一需求不屬於同一產品！'; diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index 00d7957567..d31c17f1af 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -113,11 +113,11 @@ $lang->testcase->allCases = '所有'; $lang->testcase->needConfirm = '需求變動'; $lang->testcase->bySearch = '搜索'; -$lang->testcase->lblStory = '相關需求'; -$lang->testcase->lblLastEdited = '最後編輯'; -$lang->testcase->lblTypeValue = '類型可選值列表'; -$lang->testcase->lblStageValue = '階段可選值列表'; -$lang->testcase->lblStatusValue = '狀態可選值列表'; +$lang->testcase->lblStory = '相關需求'; +$lang->testcase->lblLastEdited = '最後編輯'; +$lang->testcase->lblTypeValue = '類型可選值列表'; +$lang->testcase->lblStageValue = '階段可選值列表'; +$lang->testcase->lblStatusValue = '狀態可選值列表'; $lang->testcase->legendBasicInfo = '基本信息'; $lang->testcase->legendAttatch = '附件'; diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php index abdbe569a0..b603153c21 100644 --- a/module/testreport/lang/zh-tw.php +++ b/module/testreport/lang/zh-tw.php @@ -42,7 +42,7 @@ $lang->testreport->legendComment = '總結'; $lang->testreport->legendMore = '更多功能'; $lang->testreport->bugSeverityGroups = 'Bug嚴重級別分佈'; -$lang->testreport->bugTypeGroups = 'Bug類型別分布'; +$lang->testreport->bugTypeGroups = 'Bug類型別分佈'; $lang->testreport->bugStatusGroups = 'Bug狀態分佈'; $lang->testreport->bugOpenedByGroups = 'Bug創建者分佈'; $lang->testreport->bugResolvedByGroups = 'Bug解決者分佈'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index c106dd5a0d..b8dd1f84ad 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -124,3 +124,4 @@ $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; $lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; $lang->upgrade->fromVersions['9_4'] = '9.4'; +$lang->upgrade->fromVersions['9_5'] = '9.5'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index f434f6813a..43ceb90eee 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -124,3 +124,4 @@ $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; $lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; $lang->upgrade->fromVersions['9_4'] = '9.4'; +$lang->upgrade->fromVersions['9_5'] = '9.5'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index a2a367e3a5..cbbbbaa01e 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -124,3 +124,4 @@ $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; $lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; $lang->upgrade->fromVersions['9_4'] = '9.4'; +$lang->upgrade->fromVersions['9_5'] = '9.5'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 0e19d7ea62..f72c1d0acc 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -185,6 +185,8 @@ class upgradeModel extends model case '9_4': $this->execSQL($this->getUpgradeFile('9.4')); $this->adjustPriv9_4(); + case '9_5': + $this->execSQL($this->getUpgradeFile('9.4')); } $this->deletePatch(); @@ -281,6 +283,7 @@ class upgradeModel extends model case '9_2_1': case '9_3_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('9.3.beta')); case '9_4': $confirmContent .= file_get_contents($this->getUpgradeFile('9.4')); + case '9_5': $confirmContent .= file_get_contents($this->getUpgradeFile('9.5')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); } diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index 912012206d..a0766cfce1 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -68,16 +68,16 @@ $lang->user->asGuest = "遊客訪問"; $lang->user->goback = "返回前一頁"; $lang->user->deleted = '(已刪除)'; -$lang->user->profile = '檔案'; -$lang->user->project = $lang->projectCommon; -$lang->user->task = '任務'; -$lang->user->bug = '缺陷'; -$lang->user->test = '測試'; -$lang->user->testTask = '測試任務'; -$lang->user->testCase = '測試用例'; -$lang->user->todo = '待辦'; -$lang->user->story = '需求'; -$lang->user->dynamic = '動態'; +$lang->user->profile = '檔案'; +$lang->user->project = $lang->projectCommon; +$lang->user->task = '任務'; +$lang->user->bug = '缺陷'; +$lang->user->test = '測試'; +$lang->user->testTask = '測試任務'; +$lang->user->testCase = '測試用例'; +$lang->user->todo = '待辦'; +$lang->user->story = '需求'; +$lang->user->dynamic = '動態'; $lang->user->openedBy = '由他創建'; $lang->user->assignedTo = '指派給他'; @@ -128,12 +128,12 @@ $lang->user->tpl->content = '內容'; $lang->user->tpl->public = '是否公開'; $lang->user->placeholder = new stdclass(); -$lang->user->placeholder->account = '英文、數字和下劃線的組合，三位以上'; -$lang->user->placeholder->password1 = '六位以上'; -$lang->user->placeholder->role = '職位影響內容和用戶列表的順序。'; -$lang->user->placeholder->group = '分組決定用戶的權限列表。'; -$lang->user->placeholder->commiter = '版本控制系統(subversion)中的帳號'; -$lang->user->placeholder->verify = '需要輸入你的密碼加以驗證'; +$lang->user->placeholder->account = '英文、數字和下劃線的組合，三位以上'; +$lang->user->placeholder->password1 = '六位以上'; +$lang->user->placeholder->role = '職位影響內容和用戶列表的順序。'; +$lang->user->placeholder->group = '分組決定用戶的權限列表。'; +$lang->user->placeholder->commiter = '版本控制系統(subversion)中的帳號'; +$lang->user->placeholder->verify = '需要輸入你的密碼加以驗證'; $lang->user->placeholder->passwordStrength[1] = '6位以上，包含大小寫字母，數字。'; $lang->user->placeholder->passwordStrength[2] = '10位以上，包含大小寫字母，數字，特殊字元。';