From bbee66558185c5575ecdac5fa6df6974f103d0f2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 13 Sep 2016 10:26:53 +0800 Subject: [PATCH] * change for upgrade. --- VERSION | 2 +- config/config.php | 2 +- module/doc/lang/zh-tw.php | 3 +++ module/file/lang/zh-tw.php | 2 +- module/report/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, 12 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index fc8336ce61..d00d9ba64a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.5 +8.2.6 diff --git a/config/config.php b/config/config.php index 343ee5d775..6935b8fcec 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.5'; // The version of zentaopms. Don't change it. +$config->version = '8.2.6'; // 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/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 5666c6db92..d9418d1101 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -69,3 +69,6 @@ $lang->doc->errorEmptyProject = "沒有{$lang->projectCommon}，無法創建文 $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = '相應的連結地址'; + +$lang->doclib = new stdclass(); +$lang->doclib->name = '文檔庫名稱'; diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php index 5712f9b9c3..526dac0f5d 100644 --- a/module/file/lang/zh-tw.php +++ b/module/file/lang/zh-tw.php @@ -35,6 +35,6 @@ $lang->file->errorSuffix = '壓縮包格式錯誤，只能上傳zip壓縮 $lang->file->errorExtract = '解壓縮失敗！可能檔案已經損壞，或壓縮包裡含有非法上傳檔案。'; $lang->file->uploadImagesExplain = <<1、上傳檔案為包含圖片的zip壓縮包，程序會以檔案名作為標題，以圖片作為內容。

-

2、如果檔案名可以開頭含有 數字+下劃線，以方便排序，程序會將他們忽略。

+

2、如果檔案名開頭含有 數字+下劃線，以方便排序，程序會將他們忽略。

3、圖片格式：jpg|jpeg|gif|png。

EOD; diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php index 65bd93eaa7..ca0a4c1bce 100644 --- a/module/report/lang/zh-tw.php +++ b/module/report/lang/zh-tw.php @@ -40,6 +40,7 @@ $lang->report->workload = '員工負載表'; $lang->report->workloadAB = '工作負載'; $lang->report->bugOpenedDate = 'Bug創建時間'; $lang->report->taskAssignedDate = '起止時間'; +$lang->report->beginAndEnd = '起止時間'; $lang->report->dept = '部門'; $lang->reportList->project->lists[10] = $lang->projectCommon . '偏差報表|report|projectdeviation'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index acb0a16869..45f2bd7c8b 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -106,3 +106,4 @@ $lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; $lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; $lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; $lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; +$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 85e575708d..ce58e80579 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -106,3 +106,4 @@ $lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; $lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; $lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; $lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; +$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index b2b627cf6a..cb53223b0c 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -106,3 +106,4 @@ $lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; $lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; $lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; $lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; +$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 50426ed02e..9505c8e128 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -147,6 +147,7 @@ class upgradeModel extends model case '8_2_2': case '8_2_3': case '8_2_4': + case '8_2_5': default: if(!$this->isError()) $this->setting->updateVersion($this->config->version); } @@ -229,6 +230,7 @@ class upgradeModel extends model case '8_2_2': case '8_2_3': case '8_2_4': + case '8_2_5': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }