Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/zentaobiz16' into 'master'

Browse Source 
* Code for task#73360,#73366,#73363.

See merge request easycorp/zentaopms!5952
This commit is contained in:
孙广明
2022-10-31 06:26:51 +00:00
parent afba980ce4 60444fd796
commit ff132b7deb
5 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+5 -4
View File
@@ -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';
module/common/lang/en.php
+5 -4
View File
@@ -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';
module/common/lang/fr.php
+5 -4
View File
@@ -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';
module/common/lang/menu.php
+15 -10
View File
@@ -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();
module/common/lang/zh-cn.php
+2 -1
View File
@@ -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%的结果集进行统计。';