From 60444fd7967ecbe85a092613f636f4454b4f4732 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 25 Oct 2022 16:46:56 +0000 Subject: [PATCH] * Code for task#73360,#73366,#73363. --- module/common/lang/de.php | 9 +++++---- module/common/lang/en.php | 9 +++++---- module/common/lang/fr.php | 9 +++++---- module/common/lang/menu.php | 25 +++++++++++++++---------- module/common/lang/zh-cn.php | 3 ++- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 91ed8d50d1..2c4263c67c 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -166,7 +166,7 @@ $lang->qa->common = 'QA'; $lang->devops->common = 'DevOps'; $lang->doc->common = 'Doc'; $lang->repo->common = 'Code'; -$lang->report->common = 'Statistic'; +$lang->report->common = 'BI'; $lang->system->common = 'System'; $lang->admin->common = 'Admin'; $lang->story->common = 'Story'; @@ -272,9 +272,10 @@ $lang->product->kanban = $lang->productCommon . ' Kanban'; $lang->project->report = 'Report'; -$lang->report->weekly = 'Weekly'; -$lang->report->annual = 'Annual Summary'; -$lang->report->notice = new stdclass(); +$lang->report->weekly = 'Weekly'; +$lang->report->annual = 'Annual Summary'; +$lang->report->pivotTable = 'Pivot Table'; +$lang->report->notice = new stdclass(); $lang->report->notice->help = 'Hinweis: Berichte wurde auf Basis der Suche generiert. Bitte suchen Sie in der Liste bevor Sie einen Bericht generieren.'; $lang->testcase->case = 'Test Case'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 4dac83fa31..c4c1ad3c35 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -166,7 +166,7 @@ $lang->qa->common = 'QA'; $lang->devops->common = 'DevOps'; $lang->doc->common = 'Doc'; $lang->repo->common = 'Code'; -$lang->report->common = 'Statistic'; +$lang->report->common = 'BI'; $lang->system->common = 'System'; $lang->admin->common = 'Admin'; $lang->story->common = 'Story'; @@ -272,9 +272,10 @@ $lang->product->kanban = $lang->productCommon . ' Kanban'; $lang->project->report = 'Report'; -$lang->report->weekly = 'Weekly'; -$lang->report->annual = 'Annual Summary'; -$lang->report->notice = new stdclass(); +$lang->report->weekly = 'Weekly'; +$lang->report->annual = 'Annual Summary'; +$lang->report->pivotTable = 'Pivot Table'; +$lang->report->notice = new stdclass(); $lang->report->notice->help = 'Note: The report is generated on the results of browsing the list. Click, e.g. AssignedToMe, then click Create Report to generate a report based on AssignedToMe list.'; $lang->testcase->case = 'Test Case'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 67caf6b5fd..eb355d07a7 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -166,7 +166,7 @@ $lang->qa->common = 'QA'; $lang->devops->common = 'DevOps'; $lang->doc->common = 'Doc'; $lang->repo->common = 'Code'; -$lang->report->common = 'Statistic'; +$lang->report->common = 'BI'; $lang->system->common = 'System'; $lang->admin->common = 'Admin'; $lang->story->common = 'Story'; @@ -272,9 +272,10 @@ $lang->product->kanban = $lang->productCommon . ' Kanban'; $lang->project->report = 'Report'; -$lang->report->weekly = 'Weekly'; -$lang->report->annual = 'Annual Summary'; -$lang->report->notice = new stdclass(); +$lang->report->weekly = 'Weekly'; +$lang->report->annual = 'Annual Summary'; +$lang->report->pivotTable = 'Pivot Table'; +$lang->report->notice = new stdclass(); $lang->report->notice->help = 'Note : Le rapport est généré à partir des résultats de la liste consultée. Par exemple, cliquez sur AssignedToMe, puis Générer Rapport pour obtenir un rapport basé sur la liste de ce qui vous est assigné.'; $lang->testcase->case = 'Test Case'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 856fe405a8..60207d6f69 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -468,19 +468,24 @@ $lang->doc->menu->api['subMenu']->index = array('link' => "{$lang->doc->apiDoc} $lang->doc->menu->api['subMenu']->struct = array('link' => "{$lang->doc->apiStruct}|api|struct|libID=%s", 'alias' => 'createstruct,editstruct'); /* Report menu.*/ -$lang->report->menu = new stdclass(); -$lang->report->menu->annual = array('link' => "{$lang->report->annual}|report|annualData|year=&dept=&userID=" . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank'); -$lang->report->menu->product = array('link' => "{$lang->product->common}|report|productsummary"); -$lang->report->menu->project = array('link' => "{$lang->project->common}|report|projectdeviation"); -$lang->report->menu->test = array('link' => "{$lang->qa->common}|report|bugcreate", 'alias' => 'bugassign'); -$lang->report->menu->staff = array('link' => "{$lang->system->common}|report|workload"); +$lang->report->menu = new stdclass(); +$lang->report->menu->annual = array('link' => "{$lang->report->annual}|report|annualData|year=&dept=&userID=" . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank'); +$lang->report->menu->pivotTable = array('link' => "{$lang->report->pivotTable}|report|productsummary", 'alias' => 'projectdeviation,bugcreate,workload,bugassign'); /* Report menu order. */ $lang->report->menuOrder[5] = 'annual'; -$lang->report->menuOrder[10] = 'product'; -$lang->report->menuOrder[15] = 'project'; -$lang->report->menuOrder[20] = 'test'; -$lang->report->menuOrder[25] = 'staff'; +$lang->report->menuOrder[10] = 'pivotTable'; + +$lang->report->menu->pivotTable['subMenu'] = new stdclass(); +$lang->report->menu->pivotTable['subMenu']->product = array('link' => "{$lang->product->common}|report|productsummary"); +$lang->report->menu->pivotTable['subMenu']->project = array('link' => "{$lang->project->common}|report|projectdeviation"); +$lang->report->menu->pivotTable['subMenu']->test = array('link' => "{$lang->qa->common}|report|bugcreate", 'alias' => 'bugassign'); +$lang->report->menu->pivotTable['subMenu']->staff = array('link' => "{$lang->system->common}|report|workload"); + +$lang->report->menu->pivotTable['menuOrder'][5] = 'product'; +$lang->report->menu->pivotTable['menuOrder'][10] = 'project'; +$lang->report->menu->pivotTable['menuOrder'][15] = 'test'; +$lang->report->menu->pivotTable['menuOrder'][20] = 'staff'; /* Company menu.*/ $lang->company->menu = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index f601c2df79..f00f9231e6 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -166,7 +166,7 @@ $lang->qa->common = '测试'; $lang->devops->common = 'DevOps'; $lang->doc->common = '文档'; $lang->repo->common = '代码'; -$lang->report->common = '统计'; +$lang->report->common = 'BI'; $lang->system->common = '组织'; $lang->admin->common = '后台'; $lang->story->common = $lang->SRCommon; @@ -274,6 +274,7 @@ $lang->project->report = '报告'; $lang->report->weekly = '周报'; $lang->report->annual = '年度总结'; +$lang->report->pivotTable = '透视表'; $lang->report->notice = new stdclass(); $lang->report->notice->help = '注:统计报表的数据来源于列表页面的检索结果,生成统计报表前请先在列表页面进行检索。比如列表页面我们检索的是%tab%,那么报表就是基于之前检索的%tab%的结果集进行统计。';