diff --git a/VERSION b/VERSION index 31476ce156..5d24a8f43c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.8.1 +9.8.2 diff --git a/config/config.php b/config/config.php index 33043520f5..7329a1d14b 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.8.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '9.8.2'; // 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/db/zentao.sql b/db/zentao.sql index b9e1f599fe..41e5df7beb 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -773,7 +773,7 @@ CREATE TABLE IF NOT EXISTS `zt_user` ( `account` char(30) NOT NULL default '', `password` char(32) NOT NULL default '', `role` char(10) NOT NULL default '', - `realname` char(30) NOT NULL default '', + `realname` char(100) NOT NULL default '', `nickname` char(60) NOT NULL default '', `commiter` varchar(100) NOT NULL, `avatar` char(30) NOT NULL default '', diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 4923ecf7f0..878d943c58 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -118,25 +118,21 @@ $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; $lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; $lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = 'Assigned To Me'; -$lang->block->default['full']['my']['4']['block'] = 'assigntome'; -$lang->block->default['full']['my']['4']['grid'] = 8; -$lang->block->default['full']['my']['4']['source'] = ''; -$lang->block->default['full']['my']['5']['title'] = 'My Todo'; -$lang->block->default['full']['my']['5']['block'] = 'list'; -$lang->block->default['full']['my']['5']['grid'] = 4; -$lang->block->default['full']['my']['5']['source'] = 'todo'; -$lang->block->default['full']['my']['5']['params']['num'] = '20'; -$lang->block->default['full']['my']['6'] = $lang->block->default['product']['1']; +$lang->block->default['full']['my']['4']['title'] = 'My Todo'; +$lang->block->default['full']['my']['4']['block'] = 'list'; +$lang->block->default['full']['my']['4']['grid'] = 4; +$lang->block->default['full']['my']['4']['source'] = 'todo'; +$lang->block->default['full']['my']['4']['params']['num'] = '20'; +$lang->block->default['full']['my']['5']['title'] = 'Assigned To Me'; +$lang->block->default['full']['my']['5']['block'] = 'assigntome'; +$lang->block->default['full']['my']['5']['grid'] = 8; +$lang->block->default['full']['my']['5']['source'] = ''; +$lang->block->default['full']['my']['6'] = $lang->block->default['product']['2']; $lang->block->default['full']['my']['6']['source'] = 'product'; -$lang->block->default['full']['my']['7'] = $lang->block->default['project']['2']; -$lang->block->default['full']['my']['7']['source'] = 'project'; -$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['1']; +$lang->block->default['full']['my']['7'] = $lang->block->default['product']['1']; +$lang->block->default['full']['my']['7']['source'] = 'product'; +$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['8']['source'] = 'qa'; -$lang->block->default['full']['my']['9'] = $lang->block->default['product']['2']; -$lang->block->default['full']['my']['9']['source'] = 'product'; -$lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['10']['source'] = 'qa'; $lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; $lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 81537e9e7a..9d569dd3e0 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -118,25 +118,21 @@ $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; $lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; $lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = '指派给我'; -$lang->block->default['full']['my']['4']['block'] = 'assigntome'; -$lang->block->default['full']['my']['4']['grid'] = 8; -$lang->block->default['full']['my']['4']['source'] = ''; -$lang->block->default['full']['my']['5']['title'] = '我的待办'; -$lang->block->default['full']['my']['5']['block'] = 'list'; -$lang->block->default['full']['my']['5']['grid'] = 4; -$lang->block->default['full']['my']['5']['source'] = 'todo'; -$lang->block->default['full']['my']['5']['params']['num'] = '20'; -$lang->block->default['full']['my']['6'] = $lang->block->default['product']['1']; +$lang->block->default['full']['my']['4']['title'] = '我的待办'; +$lang->block->default['full']['my']['4']['block'] = 'list'; +$lang->block->default['full']['my']['4']['grid'] = 4; +$lang->block->default['full']['my']['4']['source'] = 'todo'; +$lang->block->default['full']['my']['4']['params']['num'] = '20'; +$lang->block->default['full']['my']['5']['title'] = '指派给我'; +$lang->block->default['full']['my']['5']['block'] = 'assigntome'; +$lang->block->default['full']['my']['5']['grid'] = 8; +$lang->block->default['full']['my']['5']['source'] = ''; +$lang->block->default['full']['my']['6'] = $lang->block->default['product']['2']; $lang->block->default['full']['my']['6']['source'] = 'product'; -$lang->block->default['full']['my']['7'] = $lang->block->default['project']['2']; -$lang->block->default['full']['my']['7']['source'] = 'project'; -$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['1']; +$lang->block->default['full']['my']['7'] = $lang->block->default['product']['1']; +$lang->block->default['full']['my']['7']['source'] = 'product'; +$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['8']['source'] = 'qa'; -$lang->block->default['full']['my']['9'] = $lang->block->default['product']['2']; -$lang->block->default['full']['my']['9']['source'] = 'product'; -$lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['10']['source'] = 'qa'; $lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; $lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index aa8de6c400..19495e26c8 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -118,25 +118,21 @@ $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; $lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; $lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = '指派給我'; -$lang->block->default['full']['my']['4']['block'] = 'assigntome'; -$lang->block->default['full']['my']['4']['grid'] = 8; -$lang->block->default['full']['my']['4']['source'] = ''; -$lang->block->default['full']['my']['5']['title'] = '我的待辦'; -$lang->block->default['full']['my']['5']['block'] = 'list'; -$lang->block->default['full']['my']['5']['grid'] = 4; -$lang->block->default['full']['my']['5']['source'] = 'todo'; -$lang->block->default['full']['my']['5']['params']['num'] = '20'; -$lang->block->default['full']['my']['6'] = $lang->block->default['product']['1']; +$lang->block->default['full']['my']['4']['title'] = '我的待辦'; +$lang->block->default['full']['my']['4']['block'] = 'list'; +$lang->block->default['full']['my']['4']['grid'] = 4; +$lang->block->default['full']['my']['4']['source'] = 'todo'; +$lang->block->default['full']['my']['4']['params']['num'] = '20'; +$lang->block->default['full']['my']['5']['title'] = '指派給我'; +$lang->block->default['full']['my']['5']['block'] = 'assigntome'; +$lang->block->default['full']['my']['5']['grid'] = 8; +$lang->block->default['full']['my']['5']['source'] = ''; +$lang->block->default['full']['my']['6'] = $lang->block->default['product']['2']; $lang->block->default['full']['my']['6']['source'] = 'product'; -$lang->block->default['full']['my']['7'] = $lang->block->default['project']['2']; -$lang->block->default['full']['my']['7']['source'] = 'project'; -$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['1']; +$lang->block->default['full']['my']['7'] = $lang->block->default['product']['1']; +$lang->block->default['full']['my']['7']['source'] = 'product'; +$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['8']['source'] = 'qa'; -$lang->block->default['full']['my']['9'] = $lang->block->default['product']['2']; -$lang->block->default['full']['my']['9']['source'] = 'product'; -$lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['10']['source'] = 'qa'; $lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; $lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 5f23ba0fd3..bfe22930a9 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -73,6 +73,7 @@ $lang->tutorial = '新手教程'; $lang->changeLog = '修改日誌'; $lang->manual = '手冊'; $lang->customMenu = '自定義導航'; +$lang->lineNumber = '行號'; $lang->tutorialConfirm = '檢測到你尚未退出新手教程模式，是否現在退出？'; $lang->preShortcutKey = '[快捷鍵:←]'; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index 0598964dee..0ae6830535 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -89,7 +89,7 @@ $lang->custom->notice->forceReview = "指定人提交的%s必須評審 $lang->custom->notice->forceNotReview = "指定人提交的%s不需要評審。"; $lang->custom->notice->longlife = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。'; $lang->custom->notice->priListKey = '優先順序的鍵應當為數字！'; -$lang->custom->notice->keyList = '鍵值應當為英文或數字'; +$lang->custom->notice->keyList = '鍵值應當為小寫英文字母、數字或下劃線的組合'; $lang->custom->notice->severityListKey = 'Bug嚴重程度的鍵應當為數字！'; $lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？"; $lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？"; diff --git a/module/doc/model.php b/module/doc/model.php index 3209dcb5bf..5e5f21c44e 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -696,11 +696,11 @@ class docModel extends model if($type == 'product' or $type == 'project') { $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT; - $libs = $this->dao->select('id,name,`order`')->from($table)->where('id')->in($idList)->page($pager, 'id')->orderBy('`order` desc, id desc')->fetchAll('id'); + $libs = $this->dao->select('id,name,`order`')->from($table)->where('id')->in($idList)->orderBy('`order` desc, id desc')->page($pager, 'id')->fetchAll('id'); } else { - $libs = $this->dao->select('id,name')->from(TABLE_DOCLIB)->where('id')->in($idList)->page($pager, 'id')->orderBy('`order`, id desc')->fetchAll('id'); + $libs = $this->dao->select('id,name')->from(TABLE_DOCLIB)->where('id')->in($idList)->orderBy('`order`, id desc')->page($pager, 'id')->fetchAll('id'); } return $libs; diff --git a/module/entry/lang/zh-tw.php b/module/entry/lang/zh-tw.php index 910ad1d643..9cb390ef38 100644 --- a/module/entry/lang/zh-tw.php +++ b/module/entry/lang/zh-tw.php @@ -34,3 +34,12 @@ $lang->entry->note->name = '授權應用名稱'; $lang->entry->note->code = '授權應用代號，必須為字母或數字的組合'; $lang->entry->note->ip = "允許訪問API的應用ip，多個ip用逗號隔開。支持IP段，如192.168.1.*"; $lang->entry->note->allIP = '無限制'; + +$lang->entry->errmsg['PARAM_CODE_MISSING'] = '缺少code參數'; +$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = '缺少token參數'; +$lang->entry->errmsg['SESSION_CODE_MISSING'] = '缺少session code'; +$lang->entry->errmsg['EMPTY_KEY'] = '應用未設置密鑰'; +$lang->entry->errmsg['INVALID_TOKEN'] = '無效的token參數'; +$lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'session驗證失敗'; +$lang->entry->errmsg['IP_DENIED'] = '該IP被限制訪問'; +$lang->entry->errmsg['EMPTY_ENTRY'] = '應用不存在'; diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index 87599ada61..0ff59a9215 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -74,6 +74,20 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '詳情'; +$lang->misc->releaseDate['9.8.stable'] = '2017-01-17'; +$lang->misc->releaseDate['9.7.stable'] = '2017-12-22'; +$lang->misc->releaseDate['9.6.stable'] = '2017-11-06'; +$lang->misc->releaseDate['9.5.1'] = '2017-09-27'; +$lang->misc->releaseDate['9.3.beta'] = '2017-06-21'; +$lang->misc->releaseDate['9.1.stable'] = '2017-03-23'; +$lang->misc->releaseDate['9.0.beta'] = '2017-01-03'; +$lang->misc->releaseDate['8.3.stable'] = '2016-11-09'; +$lang->misc->releaseDate['8.2.stable'] = '2016-05-17'; +$lang->misc->releaseDate['7.4.beta'] = '2015-11-13'; +$lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; +$lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; +$lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; + $lang->misc->feature->all['9.8.stable'][] = array('title'=>'實現集中的消息處理機制', 'desc' => '

郵件，短信，webhook都放統一的消息發送

移植然之裡面的消息通知功能

'); $lang->misc->feature->all['9.8.stable'][] = array('title'=>'實現周期性待辦功能', 'desc' => ''); $lang->misc->feature->all['9.8.stable'][] = array('title'=>'增加指派給我的區塊', 'desc' => ''); diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 5136c841a2..37d5e363c1 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -94,6 +94,7 @@ $lang->project->statusList['wait'] = '未開始'; $lang->project->statusList['doing'] = '進行中'; $lang->project->statusList['suspended'] = '已掛起'; $lang->project->statusList['done'] = '已完成'; +$lang->project->statusList['closed'] = '已關閉'; $lang->project->aclList['open'] = "預設設置(有{$lang->projectCommon}視圖權限，即可訪問)"; $lang->project->aclList['private'] = "私有{$lang->projectCommon}(只有{$lang->projectCommon}團隊成員才能訪問)"; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index efab07a075..b6d6d063c0 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -12,8 +12,8 @@ $lang->task->index = "Index"; $lang->task->create = "Create Task"; $lang->task->batchCreate = "Batch Create Tasks"; -$lang->task->batchEdit = "Batch Edit"; $lang->task->batchCreateChildren = "Batch Create Children"; +$lang->task->batchEdit = "Batch Edit"; $lang->task->batchChangeModule = "Batch Change Module"; $lang->task->batchClose = "Batch Close"; $lang->task->batchCancel = "Batch Cancel"; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 9c9b30446c..456bae74a3 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -9,35 +9,36 @@ * @version $Id: zh-tw.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ * @link http://www.zentao.net */ -$lang->task->index = "任務一覽"; -$lang->task->create = "建任務"; -$lang->task->batchCreate = "批量建任務"; -$lang->task->batchEdit = "批量編輯"; -$lang->task->batchChangeModule = "批量修改模組"; -$lang->task->batchClose = "批量關閉"; -$lang->task->batchCancel = "批量取消"; -$lang->task->edit = "編輯"; -$lang->task->delete = "刪除"; -$lang->task->deleted = "已刪除"; -$lang->task->delayed = '延期'; -$lang->task->view = "查看任務"; -$lang->task->logEfforts = "記錄工時"; -$lang->task->record = "工時"; -$lang->task->start = "開始"; -$lang->task->restart = "繼續"; -$lang->task->finish = "完成"; -$lang->task->pause = "暫停"; -$lang->task->close = "關閉"; -$lang->task->cancel = "取消"; -$lang->task->activate = "激活"; -$lang->task->export = "導出數據"; -$lang->task->reportChart = "報表統計"; -$lang->task->fromBug = '來源Bug'; -$lang->task->case = '相關用例'; -$lang->task->confirmStoryChange = "確認需求變動"; -$lang->task->progress = '進度'; -$lang->task->progressTips = '已消耗/(已消耗+剩餘)'; -$lang->task->copy = '複製任務'; +$lang->task->index = "任務一覽"; +$lang->task->create = "建任務"; +$lang->task->batchCreate = "批量建任務"; +$lang->task->batchCreateChildren = "批量建子任務"; +$lang->task->batchEdit = "批量編輯"; +$lang->task->batchChangeModule = "批量修改模組"; +$lang->task->batchClose = "批量關閉"; +$lang->task->batchCancel = "批量取消"; +$lang->task->edit = "編輯"; +$lang->task->delete = "刪除"; +$lang->task->deleted = "已刪除"; +$lang->task->delayed = '延期'; +$lang->task->view = "查看任務"; +$lang->task->logEfforts = "記錄工時"; +$lang->task->record = "工時"; +$lang->task->start = "開始"; +$lang->task->restart = "繼續"; +$lang->task->finish = "完成"; +$lang->task->pause = "暫停"; +$lang->task->close = "關閉"; +$lang->task->cancel = "取消"; +$lang->task->activate = "激活"; +$lang->task->export = "導出數據"; +$lang->task->reportChart = "報表統計"; +$lang->task->fromBug = '來源Bug'; +$lang->task->case = '相關用例'; +$lang->task->confirmStoryChange = "確認需求變動"; +$lang->task->progress = '進度'; +$lang->task->progressTips = '已消耗/(已消耗+剩餘)'; +$lang->task->copy = '複製任務'; $lang->task->common = '任務'; $lang->task->id = '編號'; diff --git a/module/task/model.php b/module/task/model.php index 761ab2ecc1..605e95f38a 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -305,7 +305,29 @@ class taskModel extends model if($status != 'done' and $taskStatus != $status) $changeStatus = false; } - if($changeStatus) $this->dao->update(TABLE_TASK)->set('status')->eq($status)->where('id')->eq($parentID)->exec(); + if($changeStatus) + { + $parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($parentID)->fetchAll(); + $now = helper::now(); + $task = new stdclass(); + $task->status = $status; + if($status == 'done') + { + $task->assignedTo = $parent->openedBy; + $task->assignedDate = $now; + $task->finishedBy = $this->app->user->account; + $task->finishedDate = $now; + } + + if($status == 'closed') + { + $task->assignedTo = 'closed'; + $task->assignedDate = $now; + $task->closedBy = $this->app->user->account; + $task->closedDate = $now; + } + $this->dao->update(TABLE_TASK)->data($task)->where('id')->eq($parentID)->exec(); + } } /** @@ -1141,11 +1163,10 @@ class taskModel extends model ->where('id')->eq((int)$taskID) ->exec(); + $this->dao->update(TABLE_TASK)->data($task)->where('parent')->eq($taskID)->exec(); + if($oldTask->parent) $this->dao->update(TABLE_TASK)->data($task)->where('id')->eq((int)$oldTask->parent)->exec(); $this->computeWorkingHours($oldTask->parent); - $this->dao->update(TABLE_TASK)->set('status')->eq('doing')->where('parent')->eq($taskID)->exec(); - if($oldTask->parent) $this->dao->update(TABLE_TASK)->set('status')->eq('doing')->where('id')->eq((int)$oldTask->parent)->exec(); - if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story); if(!dao::isError()) return common::createChanges($oldTask, $task); } diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 84d00df8d6..453e8d88c9 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -132,3 +132,4 @@ $lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; $lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; $lang->upgrade->fromVersions['9_7'] = '9.7'; $lang->upgrade->fromVersions['9_8'] = '9.8'; +$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 199bdd68e4..5cb4fe1699 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -132,3 +132,4 @@ $lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; $lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; $lang->upgrade->fromVersions['9_7'] = '9.7'; $lang->upgrade->fromVersions['9_8'] = '9.8'; +$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 5f4bab4d6d..591ec9d8a8 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -132,3 +132,4 @@ $lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; $lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; $lang->upgrade->fromVersions['9_7'] = '9.7'; $lang->upgrade->fromVersions['9_8'] = '9.8'; +$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index ea3c98fdef..f030c567ee 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -139,13 +139,13 @@ $lang->user->placeholder->passwordStrength[1] = '6位以上，包含大小寫字 $lang->user->placeholder->passwordStrength[2] = '10位以上，包含大小寫字母，數字，特殊字元。'; $lang->user->error = new stdclass(); -$lang->user->error->account = "ID %s，英文、數字和下劃線的組合，三位以上"; -$lang->user->error->accountDupl = "ID %s，該用戶名已經存在"; -$lang->user->error->realname = "ID %s，必須填寫真實姓名"; -$lang->user->error->password = "ID %s，密碼必須六位以上"; -$lang->user->error->mail = "ID %s，請填寫正確的郵箱地址"; -$lang->user->error->role = "ID %s，職位不能為空"; -$lang->user->error->reserved = "ID %s，該用戶名系統預留"; +$lang->user->error->account = "【ID %s】的用戶名應該為：三位以上的英文、數字或下劃線的組合"; +$lang->user->error->accountDupl = "【ID %s】的用戶名已經存在"; +$lang->user->error->realname = "【ID %s】的真實姓名必須填寫"; +$lang->user->error->password = "【ID %s】的密碼必須為六位以上"; +$lang->user->error->mail = "【ID %s】的郵箱地址不正確"; +$lang->user->error->role = "【ID %s】的職位不能為空"; +$lang->user->error->reserved = "【ID %s】的用戶名已被系統預留"; $lang->user->error->verifyPassword = "安全驗證密碼錯誤，請輸入你的登錄密碼"; $lang->user->error->originalPassword = "原密碼不正確";