From 7390d841e94996da71a81e7dcf70f4ecc4c1bdd1 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 9 Apr 2021 16:37:23 +0800 Subject: [PATCH 1/4] * Fix bug. --- module/doc/lang/en.php | 3 ++- module/doc/lang/zh-cn.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index b7b06240c9..c365e9ade4 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -105,12 +105,13 @@ $lang->doc->fixedMenu = 'Fix to Menu'; $lang->doc->removeMenu = 'Remove from Menu'; $lang->doc->search = 'Search'; +global $config; /* Query condition list. */ $lang->doc->allProduct = 'All' . $lang->productCommon . 's'; $lang->doc->allExecutions = 'All' . $lang->executionCommon . 's'; $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library'; -$lang->doc->libTypeList['project'] = 'Project Library'; +if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = 'Project Library'; $lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Library'; $lang->doc->libTypeList['custom'] = 'Custom Library'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index fcc67947e3..adf72ec989 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -105,12 +105,13 @@ $lang->doc->fixedMenu = '固定到菜单栏'; $lang->doc->removeMenu = '从菜单栏移除'; $lang->doc->search = '搜索'; +global $config; /* 查询条件列表 */ $lang->doc->allProduct = '所有' . $lang->productCommon; $lang->doc->allExecutions = '所有' . $lang->executionCommon; $lang->doc->libTypeList['product'] = $lang->productCommon . '文档库'; -$lang->doc->libTypeList['project'] = '项目文档库'; +if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = '项目文档库'; $lang->doc->libTypeList['execution'] = $lang->executionCommon . '文档库'; $lang->doc->libTypeList['custom'] = '自定义文档库'; From 6d145002a13f1c8885ce9c3cbbcf3e19704cf5a9 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 9 Apr 2021 16:37:57 +0800 Subject: [PATCH 2/4] * adjust for lang. --- module/common/lang/en.php | 15 +++++----- module/common/lang/zh-tw.php | 15 +++++----- module/doc/lang/zh-tw.php | 21 +++++++------ module/execution/lang/zh-tw.php | 52 ++++++++++++++++----------------- module/misc/lang/zh-tw.php | 4 +++ module/my/lang/zh-tw.php | 2 +- module/product/lang/zh-tw.php | 2 +- module/task/lang/zh-tw.php | 2 +- tools/check.php | 2 ++ 9 files changed, 63 insertions(+), 52 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index ad78f5a4e1..a236f17cb2 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -210,13 +210,14 @@ $lang->project->list = 'Project List'; $lang->execution->list = "{$lang->executionCommon} List"; -$lang->doc->recent = 'Recent'; -$lang->doc->my = 'My'; -$lang->doc->favorite = 'Favorite'; -$lang->doc->product = 'Product'; -$lang->doc->project = 'Project'; -$lang->doc->custom = 'Custom'; -$lang->doc->wiki = 'WIKI'; +$lang->doc->recent = 'Recent'; +$lang->doc->my = 'My'; +$lang->doc->favorite = 'Favorite'; +$lang->doc->product = 'Product'; +$lang->doc->project = 'Project'; +$lang->doc->execution = $lang->executionCommon; +$lang->doc->custom = 'Custom'; +$lang->doc->wiki = 'WIKI'; $lang->product->list = $lang->productCommon . ' List'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 0c47c69eff..46fa151b28 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -210,13 +210,14 @@ $lang->project->list = '項目列表'; $lang->execution->list = "{$lang->executionCommon}列表"; -$lang->doc->recent = '最近文檔'; -$lang->doc->my = '我的文檔'; -$lang->doc->favorite = '我的收藏'; -$lang->doc->product = '產品庫'; -$lang->doc->project = '項目庫'; -$lang->doc->custom = '自定義庫'; -$lang->doc->wiki = 'WIKI'; +$lang->doc->recent = '最近文檔'; +$lang->doc->my = '我的文檔'; +$lang->doc->favorite = '我的收藏'; +$lang->doc->product = '產品庫'; +$lang->doc->project = '項目庫'; +$lang->doc->execution = "{$lang->executionCommon}庫"; +$lang->doc->custom = '自定義庫'; +$lang->doc->wiki = 'WIKI'; $lang->product->list = $lang->productCommon . '列表'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 49de4726a4..0379584037 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -16,7 +16,7 @@ $lang->doc->product = '所屬' . $lang->productCommon; $lang->doc->project = '所屬項目'; $lang->doc->execution = '所屬' . $lang->executionCommon; $lang->doc->lib = '所屬文檔庫'; -$lang->doc->module = '所屬分類'; +$lang->doc->module = '所屬目錄'; $lang->doc->title = '文檔標題'; $lang->doc->digest = '文檔摘要'; $lang->doc->comment = '文檔備註'; @@ -83,7 +83,8 @@ $lang->doc->editBook = '編輯手冊'; $lang->doc->editType = '編輯目錄'; $lang->doc->deleteType = '刪除目錄'; $lang->doc->addType = '增加目錄'; -$lang->doc->childType = '子分類'; +$lang->doc->childType = '子目錄'; +$lang->doc->catalogName = '目錄名稱'; $lang->doc->collect = '收藏'; $lang->doc->cancelCollection = '取消收藏'; $lang->doc->deleteFile = '刪除附件'; @@ -187,13 +188,15 @@ $lang->doc->noOpenedDoc = '您還沒有創建任何文檔。'; $lang->doc->noCollectedDoc = '您還沒有收藏任何文檔。'; $lang->doc->errorEmptyLib = '文檔庫暫無數據。'; -$lang->doc->noticeAcl['lib']['product']['default'] = '有所選產品訪問權限的用戶可以訪問。'; -$lang->doc->noticeAcl['lib']['product']['custom'] = '有所選產品訪問權限或白名單裡的用戶可以訪問。'; -$lang->doc->noticeAcl['lib']['project']['default'] = "有所選項目訪問權限的用戶可以訪問。"; -$lang->doc->noticeAcl['lib']['project']['custom'] = "有所選項目訪問權限或白名單裡的用戶可以訪問。"; -$lang->doc->noticeAcl['lib']['custom']['open'] = '所有人都可以訪問。'; -$lang->doc->noticeAcl['lib']['custom']['custom'] = '白名單的用戶可以訪問。'; -$lang->doc->noticeAcl['lib']['custom']['private'] = '只有創建者自己可以訪問。'; +$lang->doc->noticeAcl['lib']['product']['default'] = '有所選產品訪問權限的用戶可以訪問。'; +$lang->doc->noticeAcl['lib']['product']['custom'] = '有所選產品訪問權限或白名單裡的用戶可以訪問。'; +$lang->doc->noticeAcl['lib']['project']['default'] = "有所選項目訪問權限的用戶可以訪問。"; +$lang->doc->noticeAcl['lib']['project']['custom'] = "有所選項目訪問權限或白名單裡的用戶可以訪問。"; +$lang->doc->noticeAcl['lib']['execution']['default'] = "有所選{$lang->executionCommon}訪問權限的用戶可以訪問。"; +$lang->doc->noticeAcl['lib']['execution']['custom'] = "有所選{$lang->executionCommon}訪問權限或白名單裡的用戶可以訪問。"; +$lang->doc->noticeAcl['lib']['custom']['open'] = '所有人都可以訪問。'; +$lang->doc->noticeAcl['lib']['custom']['custom'] = '白名單的用戶可以訪問。'; +$lang->doc->noticeAcl['lib']['custom']['private'] = '只有創建者自己可以訪問。'; $lang->doc->noticeAcl['doc']['open'] = '有文檔所屬文檔庫訪問權限的，都可以訪問。'; $lang->doc->noticeAcl['doc']['custom'] = '白名單的用戶可以訪問。'; diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index 318abc7722..a41f945e45 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -11,15 +11,15 @@ */ /* 欄位列表。*/ $lang->execution->allExecutions = '所有' . $lang->executionCommon; -$lang->execution->allExecutionAB = '所有執行'; +$lang->execution->allExecutionAB = "所有{$lang->execution->common}"; $lang->execution->id = $lang->executionCommon . '編號'; $lang->execution->type = $lang->executionCommon . '類型'; $lang->execution->name = $lang->executionCommon . '名稱'; $lang->execution->code = $lang->executionCommon . '代號'; $lang->execution->project = '所屬項目'; -$lang->execution->execName = '執行名稱'; -$lang->execution->execCode = '執行代號'; -$lang->execution->execType = '執行類型'; +$lang->execution->execName = "{$lang->execution->common}名稱"; +$lang->execution->execCode = "{$lang->execution->common}代號"; +$lang->execution->execType = "{$lang->execution->common}類型"; $lang->execution->stage = '階段'; $lang->execution->pri = '優先順序'; $lang->execution->openedBy = '由誰創建'; @@ -39,14 +39,14 @@ $lang->execution->workHourUnit = 'h'; $lang->execution->totalHours = '可用工時'; $lang->execution->totalDays = '可用工日'; $lang->execution->status = $lang->executionCommon . '狀態'; -$lang->execution->execStatus = '執行狀態'; +$lang->execution->execStatus = "{$lang->execution->common}狀態"; $lang->execution->subStatus = '子狀態'; $lang->execution->desc = $lang->executionCommon . '描述'; -$lang->execution->execDesc = '執行描述'; +$lang->execution->execDesc = "{$lang->execution->common}描述"; $lang->execution->owner = '負責人'; $lang->execution->PO = $lang->productCommon . '負責人'; $lang->execution->PM = $lang->executionCommon . '負責人'; -$lang->execution->execPM = '執行負責人'; +$lang->execution->execPM = "{$lang->execution->common}負責人"; $lang->execution->QD = '測試負責人'; $lang->execution->RD = '發佈負責人'; $lang->execution->release = '發佈'; @@ -149,7 +149,7 @@ $lang->execution->burnByList['estimate'] = "按計劃工時查看"; $lang->execution->burnByList['storyPoint'] = '按故事點查看'; /* 方法列表。*/ -$lang->execution->index = "執行主頁"; +$lang->execution->index = "{$lang->execution->common}主頁"; $lang->execution->task = '任務列表'; $lang->execution->groupTask = '分組瀏覽任務'; $lang->execution->story = "{$lang->SRCommon}列表"; @@ -174,29 +174,29 @@ $lang->execution->linkPlan = "關聯計劃"; $lang->execution->unlinkStoryTasks = "未關聯{$lang->SRCommon}任務"; $lang->execution->linkedProducts = '已關聯'; $lang->execution->unlinkedProducts = '未關聯'; -$lang->execution->view = "執行概況"; -$lang->execution->startAction = "開始執行"; -$lang->execution->activateAction = "激活執行"; -$lang->execution->delayAction = "延期執行"; -$lang->execution->suspendAction = "掛起執行"; -$lang->execution->closeAction = "關閉執行"; -$lang->execution->testtaskAction = "執行測試單"; -$lang->execution->teamAction = "執行團隊"; -$lang->execution->kanbanAction = "執行看板"; +$lang->execution->view = "{$lang->execution->common}概況"; +$lang->execution->startAction = "開始{$lang->execution->common}"; +$lang->execution->activateAction = "激活{$lang->execution->common}"; +$lang->execution->delayAction = "延期{$lang->execution->common}"; +$lang->execution->suspendAction = "掛起{$lang->execution->common}"; +$lang->execution->closeAction = "關閉{$lang->execution->common}"; +$lang->execution->testtaskAction = "{$lang->execution->common}測試單"; +$lang->execution->teamAction = "{$lang->execution->common}團隊"; +$lang->execution->kanbanAction = "{$lang->execution->common}看板"; $lang->execution->printKanbanAction = "打印看板"; -$lang->execution->treeAction = "執行樹狀圖"; -$lang->execution->exportAction = "導出執行"; +$lang->execution->treeAction = "{$lang->execution->common}樹狀圖"; +$lang->execution->exportAction = "導出{$lang->execution->common}"; $lang->execution->computeBurnAction = "計算燃盡圖"; $lang->execution->create = "添加{$lang->executionCommon}"; -$lang->execution->createExec = "添加執行"; -$lang->execution->copyExec = "複製執行"; +$lang->execution->createExec = "添加{$lang->execution->common}"; +$lang->execution->copyExec = "複製{$lang->execution->common}"; $lang->execution->copy = "複製{$lang->executionCommon}"; $lang->execution->delete = "刪除{$lang->executionCommon}"; -$lang->execution->deleteAB = "刪除執行"; -$lang->execution->browse = "瀏覽執行"; +$lang->execution->deleteAB = "刪除{$lang->execution->common}"; +$lang->execution->browse = "瀏覽{$lang->execution->common}"; $lang->execution->list = "{$lang->executionCommon}列表"; $lang->execution->edit = "編輯{$lang->executionCommon}"; -$lang->execution->editAction = "編輯執行"; +$lang->execution->editAction = "編輯{$lang->execution->common}"; $lang->execution->batchEdit = "編輯"; $lang->execution->batchEditAction = "批量編輯"; $lang->execution->manageMembers = '團隊管理'; @@ -259,7 +259,7 @@ $lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}"; /* 頁面提示。*/ $lang->execution->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此{$lang->executionCommon}中"; -$lang->execution->selectExecution = "請選擇執行"; +$lang->execution->selectExecution = "請選擇{$lang->execution->common}"; $lang->execution->beginAndEnd = '起止時間'; $lang->execution->lblStats = '工時統計'; $lang->execution->stats = '可用工時 %s 工時，總共預計 %s 工時，已經消耗 %s 工時，預計剩餘 %s 工時'; @@ -294,7 +294,7 @@ $lang->execution->noExecution = "暫時沒有{$lang->executionCommon}。 $lang->execution->noMembers = '暫時沒有團隊成員。'; $lang->execution->workloadTotal = "工作量占比累計不應當超過100, 當前產品下的工作量之和為%s"; // $lang->execution->linkProjectStoryTip = "(關聯{$lang->SRCommon}來源於項目下所關聯的{$lang->SRCommon})"; -$lang->execution->linkAllStoryTip = "(項目下還未關聯{$lang->SRCommon}，可直接關聯該執行所關聯產品的{$lang->SRCommon})"; +$lang->execution->linkAllStoryTip = "(項目下還未關聯{$lang->SRCommon}，可直接關聯該{$lang->execution->common}所關聯產品的{$lang->SRCommon})"; /* 交互提示。*/ $lang->execution->confirmDelete = "您確定刪除{$lang->executionCommon}[%s]嗎？"; diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index d65daea3ef..6e33ecaf02 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -84,6 +84,8 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '詳情'; +$lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; +$lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; $lang->misc->releaseDate['12.5.2'] = '2020-12-18'; $lang->misc->releaseDate['12.5.1'] = '2020-11-30'; @@ -138,6 +140,8 @@ $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.0.rc2'][] = array('title' => '修復Bug，優化界面交互', 'desc' => ''); +$lang->misc->feature->all['15.0.rc1'][] = array('title' => '升級到15版本，重構導航、文檔庫，增加項目集管理', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => '優化年度總結', 'desc' => ''); $lang->misc->feature->all['12.5.2'][] = array('title' => '修復Bug', 'desc' => ''); $lang->misc->feature->all['12.5.1'][] = array('title' => '修復漏洞。', 'desc' => ''); diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index e92e3482dc..9f42ee7ad2 100644 --- a/module/my/lang/zh-tw.php +++ b/module/my/lang/zh-tw.php @@ -52,7 +52,7 @@ $lang->my->myExecutions = "我參與的階段/衝刺/迭代"; $lang->my->name = '名稱'; $lang->my->code = '代號'; $lang->my->projects = '所屬項目'; -$lang->my->executions = '所屬執行'; +$lang->my->executions = "所屬{$lang->executionCommon}"; $lang->my->executionMenu = new stdclass(); $lang->my->executionMenu->undone = '未結束'; diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index d05a7fd007..190828ff08 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -149,7 +149,7 @@ if($config->systemMode == 'new') } else { - $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人可訪問)"; + $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、相關聯{$lang->executionCommon}的團隊成員可訪問)"; } $lang->product->aclList['open'] = "公開(有{$lang->productCommon}視圖權限，即可訪問)"; //$lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名單的成員可以訪問)'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index a0107f224a..5f24670fb2 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -55,7 +55,7 @@ $lang->task->allModule = '所有模組'; $lang->task->common = '任務'; $lang->task->id = '編號'; -$lang->task->project = '所屬執行'; +$lang->task->project = '所屬項目'; $lang->task->execution = '所屬' . $lang->execution->common; $lang->task->module = '所屬模組'; $lang->task->moduleAB = '模組'; diff --git a/tools/check.php b/tools/check.php index 9d832e4a6a..0d531c667e 100755 --- a/tools/check.php +++ b/tools/check.php @@ -12,6 +12,8 @@ $config->productLink = '-'; $config->projectLink = '-'; $config->executionLink = '-'; $config->systemMode = 'new'; +$config->URAndSR = true; +$config->systemScore = true; /* set module root path and included the resource of group module. */ $moduleRoot = '../module/'; From b003002dadb6723b0e63a19425792ccefdd855f7 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 9 Apr 2021 16:40:37 +0800 Subject: [PATCH 3/4] * Fix delete link. --- module/doc/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/doc/control.php b/module/doc/control.php index 778b899373..c51d41e5c1 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -622,6 +622,7 @@ class doc extends control { $doc = $this->doc->getByID($docID); $objectType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($doc->lib)->fetch('type'); + if($this->config->systemMode == 'classic' and $objectType == 'project') $objectType = 'execution'; $this->doc->delete(TABLE_DOC, $docID); /* if ajax request, send result. */ From d348f06080c86b7644ba86fe823259755fdeb9bd Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Fri, 9 Apr 2021 16:42:02 +0800 Subject: [PATCH 4/4] * Adjust the code. --- module/doc/view/editlib.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index 95c72e7bee..b6bb6b2e87 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -43,7 +43,7 @@ doclib->control;?> - type == 'product' or $lib->type == 'execution' or $config->systemMode == 'classic'):?> + type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom' )):?> doclib->aclListA, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?> doc->noticeAcl['lib'][$lib->type][$lib->acl];?>