* add new version and upgrade.

2017-09-26 13:45:32 +08:00
parent 50460830e2
commit 06752d4cb3
16 changed files with 68 additions and 35 deletions
@@ -1 +1 @@
-9.5.stable
+9.5.1
@@ -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.
@@ -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('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');

@@ -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';
@@ -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        = '休息日';
@@ -195,3 +195,13 @@ $lang->install->zdoo->desc = <<<EOD
  <li>An integrated and collaborative platform</li>
 </ul>
 EOD;
+$lang->install->xuanxuan = new stdclass();
+$lang->install->xuanxuan->name = 'Xuanxuan IM';
+$lang->install->xuanxuan->desc = <<<EOD
+<ul>
+  <li>lightweight and easy to deploy</li>
+  <li>truly complete cross platform solutions</li>
+  <li>Based on Html5, the beautiful</li>
+  <li>Open architecture</li>
+</ul>
+EOD;
@@ -195,3 +195,13 @@ $lang->install->zdoo->desc = <<<EOD
  <li>提供一體化管理平台</li>
 </ul>
 EOD;
+$lang->install->xuanxuan = new stdclass();
+$lang->install->xuanxuan->name = '喧喧即時聊天軟件';
+$lang->install->xuanxuan->desc = <<<EOD
+<ul>
+  <li>輕：輕量級架構，容易部署</li>
+  <li>跨：真正完整跨平台解決方案</li>
+  <li>美：基于Html5開發，界面美觀</li>
+  <li>開：開放架構，方便二開整合</li>
+</ul>
+EOD;
@@ -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 = '指派給我';
@@ -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 = '該需求與上一需求不屬於同一產品！';
@@ -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      = '附件';
@@ -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解決者分佈';
@@ -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';
@@ -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';
@@ -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';
@@ -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);
    }
@@ -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位以上，包含大小寫字母，數字，特殊字元。';