Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

2021-08-04 14:23:04 +08:00
parent 15bd66d47b 392f0b1525
commit 9629cfa015
37 changed files with 1595 additions and 124 deletions
@@ -1 +1 @@
-15.2
+15.3
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}

 /* 基本设置。Basic settings. */
-$config->version       = '15.2';           // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '15.3';           // 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.
@@ -1,3 +1,108 @@
+2021-08-04 15.3
+完成的需求
+27092 文档下拉菜单中增加附件库的选择
+26857 禅道右下角显示禅道版本号方便商务支持同事排查问题节省交互时间
+26773 在文档全屏的时候显示上一篇、下一篇的操作
+26772 文档增加全屏查看功能
+26771 文档大纲支持展开/收起功能
+26770 文档详情页面增加文档大纲功能
+15718 项目集列表中，负责人名称前显示头像
+26766 目录的操作按钮放置到目录页面的右侧
+26765 对创建下拉菜单中的内容进行分组
+26764 在具体的文档库页面增加我的收藏快速入口
+26763 文档库增加目录页面
+26469 文档名称的font-size使用20px
+26467 编辑文档页面，去掉三级导航
+26465 创建文档页面，去掉三级导航
+26463 手册模块中增加目录的高度
+26461 文档模块中增加目录信息
+26400 创建文档名称调整为创建
+26768 将关键词作为标签放到文档名称下面
+27489 实现附件库的卡片展示方式
+27488 实现附件库的列表展示方式
+27477 执行二级导航中执行名称前显示项目名称
+27476 禅道升级新版本后，引导用户使用青春蓝的主题
+27474 禅道更新全新icon
+27433 禅道新增配色样式
+27432 实现项目卡片展示方式
+27098 项目库下拉菜单中可以搜索和查看已结束的项目文档
+27430 项目列表增加卡片视图的切换方式
+27429 调整产品列表中字段的显示顺序
+27428 产品列表中增加项目集、产品线列表的数据统计
+27427 产品列表中将编辑产品线调整到添加产品按钮前面
+27426 项目集列表中项目名称前的项目icon调整为模型icon
+27425 项目集列表增加进度显示
+27424 调整项目集列表中字段的显示顺序
+27421 项目集列表调整项目和项目集添加方式的位置
+27389 任务bug列表把截止日期展示出来
+27270 升级程序中的sql需要兼容引擎只支持innodb的环境
+27260 文档目录中在具体的文档前面增加icon
+27431 项目卡片视图中增加项目集筛选菜单
+修复的Bug
+11198  升级到旗舰版后系统用户默认权限没有添加导致用户登录后无法正常访问
+12197  项目下新建文档保存后页面未正确展示
+12318  max2.0rc1 关于工作流：1.字段-公示类型的，无法生效 2.详情 动作界面，编辑--区块，无法添加
+12573  客户端消息右键创建任务页面所属执行没有列出阶段
+12846  word类型文档编辑页面文档类型没有默认值
+13141  新版本动作界面附件字段不显示
+13386  biz4.1按老版本习惯升级后，待办转任务未关联处项目数据
+13460  工作流项目流程字段和动作展示问题
+13536  请假详情页点击拒绝后跳转到了编辑页
+13039  任务看板导出和页面显示内容不一致
+13092  所有产品、项目不支持导出
+13377  pro7.1按老版本习惯升级后，新建产品保存时有错误提示信息
+12807  数据量多的时候创建索引时间很久
+12476  客户端中进入禅道相关页面加载错误
+12930  年底统计报表中需求创建数量不对
+13420  集成gitlab后查看代码页面报错
+13638  gitlab类型的版本库页面有代码报错
+13639  关联issue页面有代码报错
+13722  执行动态页面报错
+13647  创建需求、任务、Bug同步到gitlab，有js报错
+11269  beta3中有测试代码导致报错
+12412  主表设计下载的模板全是报错
+12422  主表字段导入确认页面显示问题
+12673  干系人相关动态文案需修改
+12928  权限分组列表显示的数据不全
+13059  创建的scrum项目无法保存
+13096  项目矩阵显示了与该项目无关的需求
+13097  任务不能记录日志
+13238  问题确认弹窗显示异常，无法操作
+13239  问题解决方式为转任务后，保存提示开始时间不能为空
+13278  旗舰版新增工作流发布在执行二级导航时，页面跳转有问题
+13332  瀑布模式单独创建阶段还需要维护阶段代号
+13346  通过阶段设置插入阶段会修改之前阶段的ID
+13512  评审页面查看用例所属的产品时闪现代码
+13523  集成测试用例评审页面查看用例时有代码报错
+13530  自定义配置的模板类型发起评审时也列出来了
+13532  评审用户需求说明书页面有代码报错
+13538  评审软件需求说明书页面有代码报错
+13717  给瀑布项目会显示“所属迭代”
+13486  创建FAQ页面有代码报错
+13559  项目内置流程新增字段在列表不显示
+13608  工作流新增字段默认值设置不生效
+12201  统计里报表涉及到项目的都显示为执行了
+13213  专业版App发布详情页有报错
+13243  变更需求导出 word 最后编辑日期为 0000-00-00
+13244  需求导出 word 展示模块取值错误
+13258  需求导出 word 图片大小适配问题
+13265  产品项目列表的迭代改为项目
+13564  自定义报表中项目计划完成日期统计有问题
+13724  移动端需求排序报错
+12106  批量编辑需求阶段显示报错
+13716  权限名称和对应页面菜单名字不一致
+6900   搜索用户名时，不显示用户名信息
+13045  新建产品是否需要强制关联产品规则统一
+13216  php5.3环境代码兼容问题
+13516  早上在执行下面操作完成第一个任务后会提示你无权限访问该迭代
+13616  再次编辑飞书配置时丢失秘钥
+13632  测试单中查看报表报错
+13659  测试单生成报表报错
+13701  批量编辑任务页面起止日期字段显示不全
+13703  甘特图百分比统计错误
+13721  按老版本习惯升级后，jenkins服务器数据丢失
+13725  测试-用例-导出模板-CSV文件名字拼错
+
 2021-07-20 15.2
 完成的需求
 27297 调整产品下拉菜单信息展现方式
@@ -2122,7 +2227,7 @@
 1601 版本列表区块，版本ID显示为1、2，统一为001、002
 1600 Bug详情页，解决操作没有图标，严重程度图标数字太靠上
 1599 右上角，用户名--切换语言。显示的是英文 language ，简体和繁体下应显示为中文
-1597 永久关闭区块的提示文案，第二句开头少一个‘关’字，最后少个句号 [BUG#1597]
+1597 永久关闭区块的提示文案，第二句开头少一个‘关’字，最后少个句号
 1595 我的地盘里，编辑页面的 保存和取消 按钮的间距宽度比较宽，是否整个系统里统一一下保存和取消（返回）的间距宽度
 1592 我的待办区块，添加待办成功后，跳转到区块底部
 1591 我的待办区块，点击待办名称，然后编辑，待办名称必填项与边框有重叠
@@ -59,6 +59,7 @@ $lang->bug->resolvedBuild    = '解決版本';
 $lang->bug->resolvedDate     = '解決日期';
 $lang->bug->resolvedDateAB   = '解決日期';
 $lang->bug->deadline         = '截止日期';
+$lang->bug->deadlineAB       = '截止';
 $lang->bug->plan             = '所屬' . '計劃';
 $lang->bug->closedBy         = '由誰關閉';
 $lang->bug->closedDate       = '關閉日期';
@@ -78,6 +79,7 @@ $lang->bug->lastEditedDate   = '修改日期';
 $lang->bug->fromCase         = '來源用例';
 $lang->bug->toCase           = '生成用例';
 $lang->bug->colorTag         = '顏色標籤';
+$lang->bug->fixedRate        = '修復率';

 /* 方法列表。*/
 $lang->bug->index              = '首頁';
@@ -25,21 +25,22 @@ $lang->ellipsis  = '…';
 $lang->percent   = '%';
 $lang->dash      = '-';

-$lang->zentaoPMS        = '禪道';
-$lang->logoImg          = 'zt-logo.png';
-$lang->welcome          = "%s項目管理系統";
-$lang->logout           = '退出';
-$lang->login            = '登錄';
-$lang->help             = '幫助';
-$lang->aboutZenTao      = '關於禪道';
-$lang->profile          = '個人檔案';
-$lang->changePassword   = '修改密碼';
-$lang->unfoldMenu       = '展開導航';
-$lang->collapseMenu     = '收起導航';
-$lang->preference       = '個性化設置';
-$lang->runInfo          = "<div class='row'><div class='u-1 a-center' id='debugbar'>時間: %s 毫秒, 內存: %s KB, 查詢: %s.  </div></div>";
-$lang->agreement        = "已閲讀並同意<a href='http://zpl.pub/page/zplv12.html' target='_blank'>《Z PUBLIC LICENSE授權協議1.2》</a>。<span class='text-danger'>未經許可，不得去除、隱藏或遮掩禪道軟件的任何標誌及連結。</span>";
-$lang->designedByAIUX   = "<a href='https://api.zentao.net/goto.php?item=aiux' class='link-aiux' target='_blank'><i class='icon icon-aiux'></i> 艾體驗設計</a>";
+$lang->zentaoPMS      = '禪道';
+$lang->proName        = '專業版';
+$lang->logoImg        = 'zt-logo.png';
+$lang->welcome        = "%s項目管理系統";
+$lang->logout         = '退出';
+$lang->login          = '登錄';
+$lang->help           = '幫助';
+$lang->aboutZenTao    = '關於禪道';
+$lang->profile        = '個人檔案';
+$lang->changePassword = '修改密碼';
+$lang->unfoldMenu     = '展開導航';
+$lang->collapseMenu   = '收起導航';
+$lang->preference     = '個性化設置';
+$lang->runInfo        = "<div class='row'><div class='u-1 a-center' id='debugbar'>時間: %s 毫秒, 內存: %s KB, 查詢: %s.  </div></div>";
+$lang->agreement      = "已閲讀並同意<a href='http://zpl.pub/page/zplv12.html' target='_blank'>《Z PUBLIC LICENSE授權協議1.2》</a>。<span class='text-danger'>未經許可，不得去除、隱藏或遮掩禪道軟件的任何標誌及連結。</span>";
+$lang->designedByAIUX = "<a href='https://api.zentao.net/goto.php?item=aiux' class='link-aiux' target='_blank'><i class='icon icon-aiux'></i> 艾體驗設計</a>";

 $lang->reset        = '重填';
 $lang->cancel       = '取消';
@@ -153,6 +154,7 @@ $lang->custom->common     = '自定義';
 $lang->extension->common  = '插件';
 $lang->company->common    = '公司';
 $lang->dept->common       = '部門';
+$lang->upgrade->common    = '升級';
 $lang->program->list      = '項目集列表';
 $lang->execution->list    = "{$lang->executionCommon}列表";

@@ -3,15 +3,20 @@ $lang->compile->common = '構建';
 $lang->compile->browse = '構建歷史';
 $lang->compile->logs   = '構建日誌';

-$lang->compile->id     = 'ID';
-$lang->compile->name   = '構建名稱';
-$lang->compile->status = '構建狀態';
-$lang->compile->time   = '構建時間';
-$lang->compile->result = '構建結果';
+$lang->compile->id        = 'ID';
+$lang->compile->name      = '構建名稱';
+$lang->compile->buildType = '構建引擎';
+$lang->compile->status    = '構建狀態';
+$lang->compile->time      = '構建時間';
+$lang->compile->result    = '構建結果';
+$lang->compile->refresh   = '刷新';

 $lang->compile->statusList['success']     = '成功';
 $lang->compile->statusList['failure']     = '失敗';
 $lang->compile->statusList['created']     = '新建';
+$lang->compile->statusList['pending']     = '隊列中';
+$lang->compile->statusList['running']     = '運行中';
 $lang->compile->statusList['building']    = '構建中';
 $lang->compile->statusList['create_fail'] = '創建失敗';
 $lang->compile->statusList['timeout']     = '執行超時';
+$lang->compile->statusList['canceled']    = '已取消';
@@ -11,7 +11,7 @@
 */
 /* 欄位列表。*/
 $lang->doc->common       = '文檔';
-$lang->doc->id           = '文檔';
+$lang->doc->id           = '編號';
 $lang->doc->product      = '所屬' . $lang->productCommon;
 $lang->doc->project      = '所屬項目';
 $lang->doc->execution    = '所屬' . $lang->executionCommon;
@@ -70,6 +70,7 @@ $lang->doc->tableContents = '目錄';

 /* 方法列表。*/
 $lang->doc->index            = '文檔主頁';
+$lang->doc->createAB         = '創建';
 $lang->doc->create           = '創建文檔';
 $lang->doc->edit             = '編輯文檔';
 $lang->doc->delete           = '刪除文檔';
@@ -88,6 +89,7 @@ $lang->doc->catalogName      = '目錄名稱';
 $lang->doc->collect          = '收藏';
 $lang->doc->cancelCollection = '取消收藏';
 $lang->doc->deleteFile       = '刪除附件';
+$lang->doc->menuTitle        = '目錄';

 $lang->doc->collectAction = '收藏文檔';

@@ -104,6 +106,8 @@ $lang->doc->deleteLib      = '刪除文檔庫';
 $lang->doc->fixedMenu      = '固定到菜單欄';
 $lang->doc->removeMenu     = '從菜單欄移除';
 $lang->doc->search         = '搜索';
+$lang->doc->allCollections = '查看全部收藏文檔';
+$lang->doc->keywordsTips   = '多個關鍵字請用逗號分隔。';

 global $config;
 /* 查詢條件列表 */
@@ -170,6 +174,7 @@ $lang->doc->mail->edit->title   = "%s編輯了文檔 #%s:%s";

 $lang->doc->confirmDelete        = "您確定刪除該文檔嗎？";
 $lang->doc->confirmDeleteLib     = "您確定刪除該文檔庫嗎？";
+$lang->doc->confirmDeleteBook    = "您確定刪除該手冊嗎？";
 $lang->doc->confirmDeleteChapter = "您確定刪除該章節嗎？";
 $lang->doc->errorEditSystemDoc   = "系統文檔庫無需修改。";
 $lang->doc->errorEmptyProduct    = "沒有{$lang->productCommon}，無法創建文檔";
@@ -12,7 +12,7 @@ $lang->gitlab->delete        = '刪除GitLab';
 $lang->gitlab->confirmDelete = '確認刪除該GitLab嗎？';
 $lang->gitlab->gitlabAccount = 'GitLab用戶';
 $lang->gitlab->zentaoAccount = '禪道用戶';
-$lang->gitlab->serverFail    = '連接GitLab服務器異常，請檢查GitLab服務器。';
+$lang->gitlab->serverFail    = '連接GitLab伺服器異常，請檢查GitLab伺服器。';

 $lang->gitlab->browseAction  = 'GitLab列表';
 $lang->gitlab->deleteAction  = '刪除GitLab';
@@ -1367,15 +1367,16 @@ class gitlabModel extends model
            $value = '';
            list($gitlabField, $optionType, $options) = explode('|', $config);
            if(!isset($changes->$gitlabField) and $object->id != 0) continue;
-            if($optionType == 'field')  $value = $issue->$gitlabField;
-            if($optionType == 'fields') $value = $issue->$gitlabField;  // TODO(dingguodong) not implemented.
+            if($optionType == 'field' or $optionType == 'fields') $value = $issue->$gitlabField;
            if($options == 'date')      $value = $value ? date('Y-m-d', strtotime($value)) : '0000-00-00';
            if($options == 'datetime')  $value = $value ? date('Y-m-d H:i:s', strtotime($value)) : '0000-00-00 00:00:00';
            if($optionType == 'userPairs' and isset($issue->$gitlabField))   $value = zget($gitlabUsers, $issue->$gitlabField);
            if($optionType == 'configItems' and isset($issue->$gitlabField)) $value = array_search($issue->$gitlabField, $this->config->gitlab->$options);
-            if($value) $object->$zentaoField = $value;

-            if($gitlabField == "description") $object->$zentaoField .= "<br>" . $issue->web_url;
+            /* Execute this line even `$value == ""`, such as `$issue->description == ""`. */
+            if($value or $value == "") $object->$zentaoField = $value;
+
+            if($gitlabField == "description") $object->$zentaoField .= "<br><br><a href=\"{$issue->web_url}\" target=\"_blank\">{$issue->web_url}</a>";
        }
        return $object;
    }
@@ -164,6 +164,7 @@ if($config->systemMode == 'new')
    $lang->resource->program->batchUnlinkStakeholders = 'batchUnlinkStakeholders';
    $lang->resource->program->unbindWhitelist         = 'unbindWhitelist';
    $lang->resource->program->export                  = 'export';
+    $lang->resource->program->updateOrder             = 'updateOrder';

    $lang->program->methodOrder[5]  = 'browse';
    $lang->program->methodOrder[10] = 'view';
@@ -183,6 +184,7 @@ if($config->systemMode == 'new')
    $lang->program->methodOrder[80] = 'batchUnlinkStakeholders';
    $lang->program->methodOrder[85] = 'unbindWhitelist';
    $lang->program->methodOrder[90] = 'export';
+    $lang->program->methodOrder[95] = 'updateOrder';

    /* Project. */
    $lang->resource->project = new stdclass();
@@ -220,6 +222,7 @@ if($config->systemMode == 'new')
    $lang->resource->project->execution           = 'execution';
    $lang->resource->project->export              = 'export';
    $lang->resource->project->createGuide         = 'createGuide';
+    $lang->resource->project->updateOrder         = 'updateOrder';

    $lang->project->methodOrder[0]   = 'index';
    $lang->project->methodOrder[5]   = 'browse';
@@ -257,6 +260,7 @@ if($config->systemMode == 'new')
    $lang->project->methodOrder[165] = 'execution';
    $lang->project->methodOrder[170] = 'export';
    $lang->project->methodOrder[175] = 'createGuide';
+    $lang->project->methodOrder[180] = 'updateOrder';

    $lang->resource->projectbuild = new stdclass();
    $lang->resource->projectbuild->browse = 'browse';
@@ -570,7 +574,7 @@ $lang->resource->execution->unlinkMember      = 'unlinkMember';
 $lang->resource->execution->linkStory         = 'linkStory';
 $lang->resource->execution->unlinkStory       = 'unlinkStory';
 $lang->resource->execution->batchUnlinkStory  = 'batchUnlinkStory';
-//$lang->resource->execution->updateOrder       = 'updateOrder';
+$lang->resource->execution->updateOrder       = 'updateOrder';
 $lang->resource->execution->kanban            = 'kanban';
 $lang->resource->execution->printKanban       = 'printKanbanAction';
 $lang->resource->execution->tree              = 'treeAction';
@@ -1129,6 +1133,7 @@ $lang->resource->gitlab->importIssue = 'importIssue';
 $lang->resource->gitlab->delete      = 'delete';
 $lang->resource->gitlab->bindUser    = 'bindUser';
 $lang->resource->gitlab->bindProduct = 'bindProduct';
+$lang->resource->gitlab->webhook     = 'webhook';

 $lang->gitlab->methodOrder[5]  = 'browse';
 $lang->gitlab->methodOrder[10] = 'create';
@@ -1137,6 +1142,7 @@ $lang->gitlab->methodOrder[20] = 'importIssue';
 $lang->gitlab->methodOrder[30] = 'delete';
 $lang->gitlab->methodOrder[35] = 'bindUser';
 $lang->gitlab->methodOrder[40] = 'bindProduct';
+$lang->gitlab->methodOrder[45] = 'webhook';

 /* Git. */
 $lang->resource->git = new stdclass();
@@ -113,6 +113,7 @@ $lang->install->errorDBName         = '資料庫名不能含有 “.” ';
 $lang->install->errorCreateDB       = '資料庫創建失敗';
 $lang->install->errorTableExists    = '數據表已經存在，您之前應該有安裝過禪道，繼續安裝請返回前頁並選擇清空數據';
 $lang->install->errorCreateTable    = '創建表失敗';
+$lang->install->errorEngineInnodb   = '您當前的資料庫不支持使用InnoDB數據表引擎，請修改為MyISAM後重試。';
 $lang->install->errorImportDemoData = '導入demo數據失敗';

 $lang->install->setConfig          = '生成配置檔案';
@@ -4,11 +4,13 @@ $lang->job->browse        = '瀏覽構建任務';
 $lang->job->create        = '創建構建任務';
 $lang->job->edit          = '編輯構建任務';
 $lang->job->exec          = '執行構建';
+$lang->job->runPipeline   = '運行流水綫';
 $lang->job->view          = '執行詳情';
 $lang->job->delete        = '刪除構建任務';
 $lang->job->confirmDelete = '確認刪除該構建任務';
 $lang->job->dirChange     = '目錄改動';
 $lang->job->buildTag      = '打標籤';
+$lang->job->execSuccess   = '執行成功';

 $lang->job->browseAction = '構建任務列表';

@@ -20,8 +22,10 @@ $lang->job->svnDir      = 'SVN監控路徑';
 $lang->job->jenkins     = 'Jenkins';
 $lang->job->jkHost      = 'Jenkins伺服器';
 $lang->job->jkJob       = 'Jenkins任務';
+$lang->job->buildSpec   = '構建對象'; // 'pipeline@server'
+$lang->job->engine      = '構建引擎';
 $lang->job->server      = '伺服器';
-$lang->job->pipeline    = '流水線';
+$lang->job->Pipeline    = '流水綫';
 $lang->job->buildType   = '構建類型';
 $lang->job->frame       = '工具/框架';
 $lang->job->triggerType = '觸發方式';
@@ -67,3 +71,19 @@ $lang->job->paramValueList['$zentao_version']  = '當前版本號';
 $lang->job->paramValueList['$zentao_account']  = '當前用戶名';
 $lang->job->paramValueList['$zentao_product']  = '當前產品ID';
 $lang->job->paramValueList['$zentao_repopath'] = '當前版本庫路徑';
+
+$lang->job->engineList = array();
+$lang->job->engineList['']        = '';
+$lang->job->engineList['gitlab']  = 'GitLab';
+$lang->job->engineList['jenkins'] = 'Jenkins';
+
+$lang->job->engineTips = new stdclass;
+$lang->job->engineTips->success = '構建引擎將使用GitLab項目內置的流水綫。';
+$lang->job->engineTips->error   = '當前GitLab項目內沒有可用的流水綫，請先前往GitLab配置。';
+
+$lang->job->pipeline = new stdclass;
+$lang->job->pipeline->pipelineTips              = "選擇要運行流水綫的分支名或標籤名";
+$lang->job->pipeline->variables                 = "變數";
+$lang->job->pipeline->variablesKeyPlaceHolder   = "輸入變數的名稱";
+$lang->job->pipeline->variablesValuePlaceHolder = "輸入變數的值";
+$lang->job->pipeline->variablesTips             = "指定要在此次運行中使用的變數值。CI/CD設置中指定的值將用作預設值。";
@@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
 $lang->misc->feature->detailed = 'Detail';

+$lang->misc->releaseDate['15.3']        = '2021-08-04';
 $lang->misc->releaseDate['15.2']        = '2021-07-20';
 $lang->misc->releaseDate['15.0.3']      = '2021-06-24';
 $lang->misc->releaseDate['15.0.2']      = '2021-06-12';
@@ -146,6 +147,7 @@ $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['15.3'][] = array('title' => 'Adjust interface style and document, fix bug', 'desc' => '');
 $lang->misc->feature->all['15.2'][] = array('title' => 'Optimize the new version upgrade process, add execution kanban.', 'desc' => '');

 $lang->misc->feature->all['15.0.3'][]      = array('title' => 'Fix Bug', 'desc' => '');
@@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
 $lang->misc->feature->detailed = '详情';

+$lang->misc->releaseDate['15.3']        = '2021-08-04';
 $lang->misc->releaseDate['15.2']        = '2021-07-20';
 $lang->misc->releaseDate['15.0.3']      = '2021-06-24';
 $lang->misc->releaseDate['15.0.2']      = '2021-06-12';
@@ -146,6 +147,7 @@ $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['15.3'][] = array('title' => '实现界面风格改动和文档优化，修复Bug', 'desc' => '');
 $lang->misc->feature->all['15.2'][] = array('title' => '优化新版本升级流程，增加执行看板。', 'desc' => '');

 $lang->misc->feature->all['15.0.3'][]      = array('title' => '修复Bug', 'desc' => '');
@@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
 $lang->misc->feature->detailed = '詳情';

+$lang->misc->releaseDate['15.3']        = '2021-08-04';
 $lang->misc->releaseDate['15.2']        = '2021-07-20';
 $lang->misc->releaseDate['15.0.3']      = '2021-06-24';
 $lang->misc->releaseDate['15.0.2']      = '2021-06-12';
@@ -146,6 +147,7 @@ $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['15.3'][] = array('title' => '實現界面風格改動和文檔優化，修復Bug', 'desc' => '');
 $lang->misc->feature->all['15.2'][] = array('title' => '優化新版本升級流程，增加執行看板。', 'desc' => '');

 $lang->misc->feature->all['15.0.3'][]      = array('title' => '修復Bug', 'desc' => '');
@@ -114,3 +114,11 @@ if($config->systemMode == 'new')
    $lang->my->executionLinkList['execution-all']   = '預設進入執行列表，可以查看所有的執行';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "預設進入最近一個{$lang->executionCommon}的任務列表，可以查看當前{$lang->executionCommon}下的任務信息";
+
+$lang->my->guideChangeTheme = <<<EOT
+<p class='theme-title'>全新<span style='color: #0c60e1'>“青春藍”</span>主題上線了！</p>
+<div>
+  <p>只需一步，您就可以體驗全新的“青春藍”主題了，趕緊去設置吧！</p>
+  <p>滑鼠經過<span style='color: #0c60e1'>【頭像-主題-青春藍】</span>，點擊青春藍，設置成功！</p>
+</div>
+EOT;
@@ -24,7 +24,7 @@ $lang->product->mine            = '我負責';
 $lang->product->other           = '其他';
 $lang->product->closed          = '已關閉';
 $lang->product->updateOrder     = '排序';
-$lang->product->all             = "所有{$lang->productCommon}";
+$lang->product->all             = "{$lang->productCommon}列表";
 $lang->product->manageLine      = "維護{$lang->productCommon}綫";
 $lang->product->newLine         = "新建{$lang->productCommon}綫";
 $lang->product->export          = '導出數據';
@@ -1,21 +1,33 @@
 <?php
 /* Fields. */
+$lang->program->id           = 'ID';
 $lang->program->name         = 'Name';
 $lang->program->template     = 'Template';
 $lang->program->category     = 'Type';
 $lang->program->desc         = 'Description';
-$lang->program->copy         = 'Copy Program';
 $lang->program->status       = 'Status';
 $lang->program->PM           = 'Manager';
 $lang->program->budget       = 'Budget';
-$lang->program->progress     = 'Progress';
-$lang->program->children     = 'Child';
+$lang->program->budgetUnit   = 'Budget Unit';
+$lang->program->begin        = 'Begin';
+$lang->program->end          = 'End';
+$lang->program->stage        = 'Stage';
+$lang->program->type         = 'Type';
+$lang->program->pri          = 'Priority';
 $lang->program->parent       = 'Parent';
-$lang->program->allInput     = 'Input';
-$lang->program->teamCount    = 'Team';
-$lang->program->longTime     = 'Long-Term';
-$lang->program->view         = 'Program Detail';
 $lang->program->exchangeRate = 'Exchange Rate';
+$lang->program->openedBy     = 'OpenedBy';
+$lang->program->openedDate   = 'OpenedDate';
+$lang->program->closedBy     = 'ClosedBy';
+$lang->program->closedDate   = 'ClosedDate';
+$lang->program->canceledBy   = 'CanceledBy';
+$lang->program->canceledDate = 'CanceledDate';
+$lang->program->team         = 'Team';
+$lang->program->order        = 'Rank';
+$lang->program->days         = 'Available Days';
+$lang->program->acl          = 'Access Control';
+$lang->program->whitelist    = 'WhiteList';
+$lang->program->deleted      = 'Deleted';

 /* Actions. */
 $lang->program->common                  = 'Program';
@@ -24,6 +36,8 @@ $lang->program->create                  = 'Create Program';
 $lang->program->createGuide             = 'Select Template';
 $lang->program->edit                    = 'Edit Program';
 $lang->program->browse                  = 'Programs';
+$lang->program->view                    = 'Program Detail';
+$lang->program->copy                    = 'Copy Program';
 $lang->program->product                 = 'Products';
 $lang->program->project                 = 'Program Project List';
 $lang->program->all                     = 'All Programs';
@@ -39,35 +53,41 @@ $lang->program->createStakeholder       = 'Create Stakeholder';
 $lang->program->unlinkStakeholder       = 'Unlink Stakeholder';
 $lang->program->batchUnlinkStakeholders = 'Batch Remove Stakeholder';
 $lang->program->unlink                  = 'Unlink';
-$lang->program->moreProgram             = 'More program';
-$lang->program->confirmBatchUnlink      = "Do you want to batch unlink these stakeholders?";
-$lang->program->stakeholderType         = 'Stakeholder type';
-$lang->program->isStakeholderKey        = 'Key stakeholder';
-$lang->program->importStakeholder       = 'Import program';
+$lang->program->updateOrder             = 'Rank';
 $lang->program->unbindWhitelist         = 'Unbind Whitelist';
 $lang->program->importStakeholder       = 'Import from program';
 $lang->program->manageMembers           = 'Program Team';
-$lang->program->beyondParentBudget      = 'The remaining budget of the owned program has been exceeded.';
-$lang->program->parentBudget            = 'Parent program surplus budget：';
-$lang->program->beginLetterParent       = "Parent begin date: %s, begin date should be >                  = parent begin date.";
-$lang->program->endGreaterParent        = "Parent end date: %s, end date should be <                      = parent end date.";
-$lang->program->beginGreateChild        = "Child earliest begin: %s, parent begin date <                  = child earliest begin date.";
-$lang->program->endLetterChild          = "Child latest end: %s, parent end date >                        = child latest end date.";
-$lang->program->closeErrorMessage       = 'There are subprograms or projects that are not closed';
-$lang->program->hasChildren             = 'The program has a child program or the project exists and can not be deleted.';
-$lang->program->confirmDelete           = "Do you want to delete it?";
 $lang->program->confirmChangePRJUint    = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
 $lang->program->exRateNotNegative       = 'The『exchange rate』should not be negative.';
 $lang->program->changePRJUnit           = 'Update the budget unit of the project';
-$lang->program->readjustTime            = 'Change the program begin&end date.';
-$lang->program->accessDenied            = 'You have no access to the program.';
+
+$lang->program->progress         = 'Progress';
+$lang->program->children         = 'Child';
+$lang->program->allInput         = 'Input';
+$lang->program->teamCount        = 'Team';
+$lang->program->longTime         = 'Long-Term';
+$lang->program->moreProgram      = 'More program';
+$lang->program->stakeholderType  = 'Stakeholder type';
+$lang->program->parentBudget     = 'Parent program surplus budget：';
+$lang->program->isStakeholderKey = 'Key stakeholder';

 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';

-$lang->program->noProgram  = 'No program.';
-$lang->program->showClosed = 'Closed programs.';
-$lang->program->tips       = 'If a parent item set is selected, products under that parent item set can be associated. If no item set is selected, a product with the same name as the item is created by default and associated with that item.';
+$lang->program->noProgram          = 'No program.';
+$lang->program->showClosed         = 'Closed programs.';
+$lang->program->tips               = 'If a parent item set is selected, products under that parent item set can be associated. If no item set is selected, a product with the same name as the item is created by default and associated with that item.';
+$lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
+$lang->program->beginLetterParent  = "Parent begin date: %s, begin date should be >                  = parent begin date.";
+$lang->program->endGreaterParent   = "Parent end date: %s, end date should be <                      = parent end date.";
+$lang->program->beginGreateChild   = "Child earliest begin: %s, parent begin date <                  = child earliest begin date.";
+$lang->program->endLetterChild     = "Child latest end: %s, parent end date >                        = child latest end date.";
+$lang->program->closeErrorMessage  = 'There are subprograms or projects that are not closed';
+$lang->program->hasChildren        = 'The program has a child program or the project exists and can not be deleted.';
+$lang->program->confirmDelete      = "Do you want to delete it?";
+$lang->program->readjustTime       = 'Change the program begin&end date.';
+$lang->program->accessDenied       = 'You have no access to the program.';
+$lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.';

 $lang->program->endList[31]  = 'One month';
 $lang->program->endList[93]  = 'Trimester';
@@ -5,7 +5,6 @@ $lang->program->name         = '项目集名称';
 $lang->program->template     = '项目集模板';
 $lang->program->category     = '项目集类型';
 $lang->program->desc         = '项目集描述';
-$lang->program->copy         = '复制项目集';
 $lang->program->status       = '状态';
 $lang->program->PM           = '负责人';
 $lang->program->budget       = '预算';
@@ -16,7 +15,6 @@ $lang->program->stage        = '阶段';
 $lang->program->type         = '类型';
 $lang->program->pri          = '优先级';
 $lang->program->parent       = '父项目集';
-$lang->program->view         = '项目集详情';
 $lang->program->exchangeRate = '汇率';
 $lang->program->openedBy     = '由谁创建';
 $lang->program->openedDate   = '创建日期';
@@ -55,23 +53,13 @@ $lang->program->createStakeholder       = '添加干系人';
 $lang->program->unlinkStakeholder       = '移除干系人';
 $lang->program->batchUnlinkStakeholders = '批量移除干系人';
 $lang->program->unlink                  = '移除';
-$lang->program->importStakeholder       = '从父项目集导入';
+$lang->program->updateOrder             = '排序';
 $lang->program->unbindWhitelist         = '移除白名单';
 $lang->program->importStakeholder       = '从父项目集导入';
 $lang->program->manageMembers           = '项目集团队';
-$lang->program->beyondParentBudget      = '已超出所属项目集的剩余预算';
-$lang->program->beginLetterParent       = "父项目集的开始日期：%s，开始日期不能小于父项目集的开始日期";
-$lang->program->endGreaterParent        = "父项目集的完成日期：%s，完成日期不能大于父项目集的完成日期";
-$lang->program->beginGreateChild        = "子项目集的最小开始日期：%s，父项目集的开始日期不能大于子项目集的最小开始日期";
-$lang->program->endLetterChild          = "子项目的最大完成日期：%s，父项目的完成日期不能小于子项目的最大完成日期";
-$lang->program->closeErrorMessage       = '存在子项目集或项目为未关闭状态';
-$lang->program->hasChildren             = '该项目集有子项目集或项目存在，不能删除。';
-$lang->program->confirmDelete           = "您确定要删除吗？";
 $lang->program->confirmChangePRJUint    = '是否同步更新该项目集下子项目集和项目的预算的单位？若确认更新,请填写今日汇率。';
 $lang->program->exRateNotNegative       = '『汇率』不能是负数。';
 $lang->program->changePRJUnit           = '更新项目预算单位';
-$lang->program->readjustTime            = '重新调整项目集起止时间';
-$lang->program->accessDenied            = '你无权访问该项目集';

 $lang->program->progress         = '项目进度';
 $lang->program->children         = '子项目集';
@@ -1,20 +1,33 @@
 <?php
 /* Fields. */
-$lang->program->name      = '項目集名稱';
-$lang->program->template  = '項目集模板';
-$lang->program->category  = '項目集類型';
-$lang->program->desc      = '項目集描述';
-$lang->program->copy      = '複製項目集';
-$lang->program->status    = '狀態';
-$lang->program->PM        = '負責人';
-$lang->program->budget    = '預算';
-$lang->program->progress  = '項目進度';
-$lang->program->children  = '子項目集';
-$lang->program->parent    = '父項目集';
-$lang->program->allInput  = '項目集總投入';
-$lang->program->teamCount = '總人數';
-$lang->program->longTime  = '長期';
-$lang->program->view      = '項目集詳情';
+$lang->program->id           = '編號';
+$lang->program->name         = '項目集名稱';
+$lang->program->template     = '項目集模板';
+$lang->program->category     = '項目集類型';
+$lang->program->desc         = '項目集描述';
+$lang->program->status       = '狀態';
+$lang->program->PM           = '負責人';
+$lang->program->budget       = '預算';
+$lang->program->budgetUnit   = '預算單位';
+$lang->program->begin        = '計劃開始';
+$lang->program->end          = '計劃完成';
+$lang->program->stage        = '階段';
+$lang->program->type         = '類型';
+$lang->program->pri          = '優先順序';
+$lang->program->parent       = '父項目集';
+$lang->program->exchangeRate = '匯率';
+$lang->program->openedBy     = '由誰創建';
+$lang->program->openedDate   = '創建日期';
+$lang->program->closedBy     = '由誰關閉';
+$lang->program->closedDate   = '關閉日期';
+$lang->program->canceledBy   = '由誰取消';
+$lang->program->canceledDate = '取消日期';
+$lang->program->team         = '團隊';
+$lang->program->order        = '排序';
+$lang->program->days         = '可用工作日';
+$lang->program->acl          = '訪問控制';
+$lang->program->whitelist    = '白名單';
+$lang->program->deleted      = '已刪除';

 /* Actions. */
 $lang->program->common                  = '項目集';
@@ -23,6 +36,8 @@ $lang->program->create                  = '添加項目集';
 $lang->program->createGuide             = '選擇項目模板';
 $lang->program->edit                    = '編輯項目集';
 $lang->program->browse                  = '項目集列表';
+$lang->program->view                    = '項目集詳情';
+$lang->program->copy                    = '複製項目集';
 $lang->program->product                 = '產品列表';
 $lang->program->project                 = '項目集項目列表';
 $lang->program->all                     = '所有項目集';
@@ -38,32 +53,41 @@ $lang->program->createStakeholder       = '添加干係人';
 $lang->program->unlinkStakeholder       = '移除干係人';
 $lang->program->batchUnlinkStakeholders = '批量移除干係人';
 $lang->program->unlink                  = '移除';
-$lang->program->moreProgram             = '更多項目集';
-$lang->program->confirmBatchUnlink      = "您確定要批量移除這些干係人嗎？";
-$lang->program->stakeholderType         = '干係人類型';
-$lang->program->isStakeholderKey        = '關鍵干係人';
-$lang->program->importStakeholder       = '從父項目集導入';
+$lang->program->updateOrder             = '排序';
 $lang->program->unbindWhitelist         = '移除白名單';
 $lang->program->importStakeholder       = '從父項目集導入';
 $lang->program->manageMembers           = '項目集團隊';
-$lang->program->beyondParentBudget      = '已超出所屬項目集的剩餘預算';
-$lang->program->parentBudget            = '所屬項目集剩餘預算：';
-$lang->program->beginLetterParent       = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
-$lang->program->endGreaterParent        = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
-$lang->program->beginGreateChild        = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
-$lang->program->endLetterChild          = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
-$lang->program->closeErrorMessage       = '存在子項目集或項目為未關閉狀態';
-$lang->program->hasChildren             = '該項目集有子項目集或項目存在，不能刪除。';
-$lang->program->confirmDelete           = "您確定要刪除嗎？";
-$lang->program->readjustTime            = '重新調整項目集起止時間';
-$lang->program->accessDenied            = '你無權訪問該項目集';
+$lang->program->confirmChangePRJUint    = '是否同步更新該項目集下子項目集和項目的預算的單位？若確認更新,請填寫今日匯率。';
+$lang->program->exRateNotNegative       = '『匯率』不能是負數。';
+$lang->program->changePRJUnit           = '更新項目預算單位';
+
+$lang->program->progress         = '項目進度';
+$lang->program->children         = '子項目集';
+$lang->program->allInput         = '項目集總投入';
+$lang->program->teamCount        = '總人數';
+$lang->program->longTime         = '長期';
+$lang->program->moreProgram      = '更多項目集';
+$lang->program->stakeholderType  = '干係人類型';
+$lang->program->parentBudget     = '所屬項目集剩餘預算：';
+$lang->program->isStakeholderKey = '關鍵干係人';

 $lang->program->stakeholderTypeList['inside']  = '內部';
 $lang->program->stakeholderTypeList['outside'] = '外部';

-$lang->program->noProgram  = '暫時沒有項目集';
-$lang->program->showClosed = '顯示已關閉';
-$lang->program->tips       = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
+$lang->program->noProgram          = '暫時沒有項目集';
+$lang->program->showClosed         = '顯示已關閉';
+$lang->program->tips               = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
+$lang->program->confirmBatchUnlink = "您確定要批量移除這些干係人嗎？";
+$lang->program->beginLetterParent  = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
+$lang->program->endGreaterParent   = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
+$lang->program->beginGreateChild   = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
+$lang->program->endLetterChild     = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
+$lang->program->closeErrorMessage  = '存在子項目集或項目為未關閉狀態';
+$lang->program->hasChildren        = '該項目集有子項目集或項目存在，不能刪除。';
+$lang->program->confirmDelete      = "您確定要刪除嗎？";
+$lang->program->readjustTime       = '重新調整項目集起止時間';
+$lang->program->accessDenied       = '你無權訪問該項目集';
+$lang->program->beyondParentBudget = '已超出所屬項目集的剩餘預算';

 $lang->program->endList[31]  = '一個月';
 $lang->program->endList[93]  = '三個月';
@@ -67,7 +67,7 @@
          <td>
            <div class='input-group'>
              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->program->parentBudget . zget($lang->project->currencySymbol, $parentProgram->budgetUnit) . $budgetLeft : '';?>
-              <?php echo html::input('budget', '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . $placeholder);?>
+              <?php echo html::input('budget', '', "class='form-control' maxlength='10' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . $placeholder);?>
              <?php if($parentProgram):?>
              <span class='input-group-addon fix-border'><?php echo zget($budgetUnitList, $parentProgram->budgetUnit);?></span>
              <?php else:?>
@@ -49,7 +49,7 @@
          <td>
            <div class='input-group'>
              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->program->parentBudget . zget($lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?>
-              <?php echo html::input('budget', $program->budget != 0 ? $program->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($program->budget == 0 ? 'disabled ' : '') . $placeholder);?>
+              <?php echo html::input('budget', $program->budget != 0 ? $program->budget : '', "class='form-control' maxlength='10' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($program->budget == 0 ? 'disabled ' : '') . $placeholder);?>
              <?php if($parentProgram):?>
              <span class='input-group-addon'><?php echo zget($budgetUnitList, $program->budgetUnit);?></span>
              <?php else:?>
@@ -50,13 +50,14 @@ $lang->project->deleted           = 'Deleted';
 $lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
 $lang->project->testreport        = 'Test Report';
-$lang->project->testreport        = 'Testreport';
 $lang->project->selectProgram     = 'Program filtering';
 $lang->project->teamMember        = 'Team Member';

 /* Fields. */
 $lang->project->common             = 'Project';
+$lang->project->id                 = 'ID';
 $lang->project->stage              = 'Stage';
+$lang->project->model              = 'Model';
 $lang->project->PM                 = 'Manager';
 $lang->project->name               = 'Name';
 $lang->project->category           = 'Category';
@@ -66,7 +67,19 @@ $lang->project->copy               = 'Copy';
 $lang->project->begin              = 'Begin';
 $lang->project->end                = 'End';
 $lang->project->status             = 'Status';
+$lang->project->subStatus          = 'Sub Status';
+$lang->project->type               = 'Type';
+$lang->project->pri                = 'Priority';
+$lang->project->openedBy           = 'OpenedBy';
+$lang->project->openedDate         = 'OpenedDate';
+$lang->project->closedBy           = 'ClosedBy';
+$lang->project->closedDate         = 'ClosedDate';
+$lang->project->canceledBy         = 'CanceledBy';
+$lang->project->canceledDate       = 'CanceledDate';
+$lang->project->team               = 'Team';
+$lang->project->order              = 'Rank';
 $lang->project->budget             = 'Budget';
+$lang->project->budgetUnit         = 'Budget Unit';
 $lang->project->template           = 'Template';
 $lang->project->estimate           = 'Estimates';
 $lang->project->consume            = 'Cost';
@@ -187,6 +200,7 @@ $lang->project->statusList['wait']      = 'Waiting';
 $lang->project->statusList['doing']     = 'Doing';
 $lang->project->statusList['suspended'] = 'Suspended';
 $lang->project->statusList['closed']    = 'Closed';
+$lang->project->statusList['delay']     = 'Delayed';

 $lang->project->endList[31]  = 'One month';
 $lang->project->endList[93]  = 'Trimester';
@@ -47,13 +47,17 @@ $lang->project->errorNoProducts   = '最少關聯一個產品';
 $lang->project->copyNoProject     = '沒有可用的項目來複制';
 $lang->project->searchByName      = '輸入項目名稱進行檢索';
 $lang->project->deleted           = '已刪除';
-$lang->project->linkedProducts    = '已關聯';
+$lang->project->linkedProducts    = '已關聯產品';
 $lang->project->unlinkedProducts  = '未關聯';
 $lang->project->testreport        = '測試報告';
+$lang->project->selectProgram     = '項目集篩選';
+$lang->project->teamMember        = '團隊成員';

 /* Fields. */
 $lang->project->common             = '項目';
+$lang->project->id                 = '項目編號';
 $lang->project->stage              = '階段';
+$lang->project->model              = '項目管理方式';
 $lang->project->PM                 = '負責人';
 $lang->project->name               = '項目名稱';
 $lang->project->category           = '項目類型';
@@ -63,7 +67,19 @@ $lang->project->copy               = '複製項目';
 $lang->project->begin              = '計劃開始';
 $lang->project->end                = '計劃完成';
 $lang->project->status             = '狀態';
+$lang->project->subStatus          = '子狀態';
+$lang->project->type               = '項目類型';
+$lang->project->pri                = '優先順序';
+$lang->project->openedBy           = '由誰創建';
+$lang->project->openedDate         = '創建日期';
+$lang->project->closedBy           = '由誰關閉';
+$lang->project->closedDate         = '關閉日期';
+$lang->project->canceledBy         = '由誰取消';
+$lang->project->canceledDate       = '取消日期';
+$lang->project->team               = '團隊';
+$lang->project->order              = '排序';
 $lang->project->budget             = '預算';
+$lang->project->budgetUnit         = '預算單位';
 $lang->project->template           = '項目模板';
 $lang->project->estimate           = '預計';
 $lang->project->consume            = '消耗';
@@ -75,6 +91,7 @@ $lang->project->realEnd            = '實際完成日期';
 $lang->project->realBegan          = '實際開始日期';
 $lang->project->bygrid             = '看板';
 $lang->project->bylist             = '列表';
+$lang->project->bycard             = '卡片';
 $lang->project->mine               = '我參與的';
 $lang->project->myProject          = '我負責';
 $lang->project->other              = '其他';
@@ -85,6 +102,7 @@ $lang->project->durationEstimation = '工作量估算';
 $lang->project->leftStories        = '剩餘需求';
 $lang->project->leftTasks          = '剩餘任務';
 $lang->project->leftBugs           = '剩餘Bug';
+$lang->project->leftHours          = '剩餘工時';
 $lang->project->children           = '子項目';
 $lang->project->parent             = '所屬項目集';
 $lang->project->allStories         = '總需求';
@@ -103,6 +121,7 @@ $lang->project->svTitle            = '進度偏差';
 $lang->project->acTitle            = '實際花費';
 $lang->project->cvTitle            = '成本偏差';
 $lang->project->teamCount          = '人數';
+$lang->project->teamSumCount       = '共%s人';
 $lang->project->longTime           = '長期';
 $lang->project->future             = '待定';
 $lang->project->moreProject        = '更多項目';
@@ -181,6 +200,7 @@ $lang->project->statusList['wait']      = '未開始';
 $lang->project->statusList['doing']     = '進行中';
 $lang->project->statusList['suspended'] = '已掛起';
 $lang->project->statusList['closed']    = '已關閉';
+$lang->project->statusList['delay']     = '已延期';

 $lang->project->endList[31]  = '一個月';
 $lang->project->endList[93]  = '三個月';
@@ -52,7 +52,7 @@
          <td>
            <div class='input-group'>
              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->program->parentBudget . zget($lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?>
-              <?php echo html::input('budget', '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . $placeholder);?>
+              <?php echo html::input('budget', '', "class='form-control' maxlength='10' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . $placeholder);?>
              <?php if($parentProgram):?>
              <span class='input-group-addon'><?php echo zget($budgetUnitList, $parentProgram->budgetUnit);?></span>
              <?php else:?>
@@ -58,7 +58,7 @@
          <td>
            <div class='input-group'>
              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->project->parentBudget . zget($lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?>
-              <?php echo html::input('budget', $project->budget != 0 ? $project->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($project->budget == 0 ? 'disabled ' : '') . $placeholder);?>
+              <?php echo html::input('budget', $project->budget != 0 ? $project->budget : '', "class='form-control' maxlength='10' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($project->budget == 0 ? 'disabled ' : '') . $placeholder);?>
              <?php if($parentProgram):?>
              <span class='input-group-addon'><?php echo zget($budgetUnitList, $project->budgetUnit);?></span>
              <?php else:?>
@@ -164,8 +164,8 @@ if(!empty($config->URAndSR))
 {
    $lang->report->annualData->productFields['requirement'] = "Created requirements";
 }
-$lang->report->annualData->productFields['story']    = "Created stories";
-$lang->report->annualData->productFields['finished'] = "Finished stories";
+$lang->report->annualData->productFields['story']  = "Created stories";
+$lang->report->annualData->productFields['closed'] = "Closed stories";

 $lang->report->annualData->objectTypeList['product']     = $lang->productCommon;
 $lang->report->annualData->objectTypeList['story']       = $lang->SRCommon;
@@ -63,7 +63,7 @@ $lang->reportList->test->lists[13]    = 'Bug指派表|report|bugassign';
 $lang->reportList->staff->lists[10]   = '員工負載表|report|workload';

 $lang->report->id            = '編號';
-$lang->report->execution     = $lang->executionCommon;
+$lang->report->execution     = '執行';
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = '姓名';
 $lang->report->bugTotal      = 'Bug';
@@ -164,8 +164,8 @@ if(!empty($config->URAndSR))
 {
    $lang->report->annualData->productFields['requirement'] = "創建{$lang->URCommon}數";
 }
-$lang->report->annualData->productFields['story']    = "創建{$lang->SRCommon}數";
-$lang->report->annualData->productFields['finished'] = "完成需求數";
+$lang->report->annualData->productFields['story']  = "創建{$lang->SRCommon}數";
+$lang->report->annualData->productFields['closed'] = "關閉需求數";

 $lang->report->annualData->objectTypeList['product']     = $lang->productCommon;
 $lang->report->annualData->objectTypeList['story']       = "需求";
@@ -68,7 +68,7 @@ $lang->search->preview    = '預覽';
 $lang->search->result            = '搜索結果';
 $lang->search->buildSuccessfully = '初始化搜索索引成功';
 $lang->search->executeInfo       = '為您找到相關結果%s個，耗時%s秒';
-$lang->search->buildResult       = '創建 %s 索引, 新增  %s 條記錄；';
+$lang->search->buildResult       = "創建 %s 索引, 已創建  <strong class='%scount'>%s</strong> 條記錄；";

 $lang->search->modules['all']         = '全部';
 $lang->search->modules['task']        = '任務';
@@ -25,6 +25,7 @@ $lang->stakeholder->viewExpect   = '期望信息';
 $lang->stakeholder->issue        = '問題管理';
 $lang->stakeholder->viewIssue    = '活動問題列表';
 $lang->stakeholder->userIssue    = '干係人問題列表';
+$lang->stakeholder->deleted      = '已刪除';

 $lang->stakeholder->viewAction      = '干係人詳情';
 $lang->stakeholder->viewIssueAction = '問題列表';
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期設置";
 $lang->todo->project      = "所屬項目";
 $lang->todo->product      = "所屬產品";
-$lang->todo->execution    = "所屬執行";
+$lang->todo->execution    = "所屬{$lang->execution->common}";

 $lang->todo->reasonList['story'] = "轉{$lang->SRCommon}";
 $lang->todo->reasonList['task']  = "轉任務";
@@ -37,6 +37,7 @@ $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模組";
 $lang->tree->confirmDelete      = '該模組及其子模組都會被刪除，您確定刪除嗎？';
+$lang->tree->confirmDeleteMenu  = '該目錄及其子目錄都會被刪除，您確定刪除嗎？';
 $lang->tree->confirmDelCategory = '該分類及其子分類都會被刪除，您確定刪除嗎？';
 $lang->tree->confirmDeleteLine  = "您確定刪除該{$lang->productCommon}綫嗎？";
 $lang->tree->confirmRoot        = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->SRCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
@@ -140,3 +140,4 @@ $lang->upgrade->fromVersions['15_0']       = '15.0';
 $lang->upgrade->fromVersions['15_0_1']     = '15.0.1';
 $lang->upgrade->fromVersions['15_0_2']     = '15.0.2';
 $lang->upgrade->fromVersions['15_0_3']     = '15.0.3';
+$lang->upgrade->fromVersions['15_2']       = '15.2';
@@ -122,6 +122,7 @@ $lang->upgrade->mergeByProject     = "獨立的{$lang->projectCommon}：可以
 $lang->upgrade->mergeByMoreLink    = "關聯多個{$lang->productCommon}的{$lang->projectCommon}：選擇這個{$lang->projectCommon}歸屬於哪一個項目。";
 $lang->upgrade->mergeRepoTips      = "將選中的版本庫歸併到所選產品下。";
 $lang->upgrade->needBuild4Add      = '本次升級需要創建索引。請到 [後台->系統->重建索引] 頁面，重新創建索引。';
+$lang->upgrade->errorEngineInnodb  = '您當前的資料庫不支持使用InnoDB數據表引擎，請修改為MyISAM後重試。';

 $lang->upgrade->projectType['project']   = "把歷史的{$lang->projectCommon}作為項目升級";
 $lang->upgrade->projectType['execution'] = "把歷史的{$lang->projectCommon}作為執行升級";
@@ -692,13 +692,9 @@ class upgradeModel extends model
            $this->saveLogs('Execute 15_2');
            $this->execSQL($this->getUpgradeFile('15.2'));
            $this->processGitlabRepo();
-            $this->appendExec('15_2');
-        case '15_3':
-            $this->saveLogs('Execute 15_3');
-            $this->execSQL($this->getUpgradeFile('15.3'));
            $this->processStoryFileType();
            $this->processProductDoc();
-            $this->appendExec('15_3');
+            $this->appendExec('15_2');
        }

        $this->deletePatch();
@@ -890,6 +886,7 @@ class upgradeModel extends model
            case '15_0_1':
            case '15_0_2': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0.2'));
            case '15_0_3': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0.3'));
+            case '15_2': $confirmContent .= file_get_contents($this->getUpgradeFile('15.2'));
        }
        return str_replace('zt_', $this->config->db->prefix, $confirmContent);
    }
@@ -1 +1 @@
 .2
 .3