diff --git a/config/zentaopms.php b/config/zentaopms.php index a504e541ef..836c84acfe 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -227,7 +227,7 @@ $config->openMethods[] = 'doc.createbasicinfo'; $config->openMethods[] = 'project.createguide'; $config->openMethods[] = 'task.editteam'; $config->openMethods[] = 'feedback.mergeproductmodule'; -$config->openMethods[] = 'zanode.nodeList'; +$config->openMethods[] = 'zanode.nodelist'; $config->openMethods[] = 'action.restoreStages'; $config->openModules = array(); @@ -424,6 +424,7 @@ $config->programPriv->waterfall = array_merge($config->programPriv->scrum, a $config->programPriv->agileplus = $config->programPriv->scrum; $config->programPriv->waterfallplus = $config->programPriv->waterfall; +$config->safeFileTimeout = 3600; $config->waterfallModules = array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'opportunity', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'); $config->showMainMenu = true; diff --git a/db/update18.1.sql b/db/update18.1.sql index a169ff3604..15ea153c8f 100644 --- a/db/update18.1.sql +++ b/db/update18.1.sql @@ -1,6 +1,6 @@ DELETE FROM `zt_config` WHERE module = 'datatable' AND section = 'executionAll'; -update `zt_task` set `assignedTo` = '' where `mode` = 'multi' and `status` != 'done' and `status` != 'closed'; +UPDATE `zt_task` SET `assignedTo` = '' WHERE `mode` = 'multi' AND `status` != 'done' AND `status` != 'closed'; REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'scrumClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC; REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'agileplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC; @@ -65,3 +65,5 @@ REPLACE INTO `zt_process` (`model`, `name`, `type`, `abbr`, `desc`, `assignedTo` UPDATE `zt_chart` SET `sql` = 'SELECT tt.join as `year`, count(1) as number, tt.name from (\r\nselect \r\nt2.name, YEAR(t1.join) as `join`\r\nfrom zt_team t1 \r\nRIGHT JOIN zt_project t2 on t2.id = t1.root\r\nRIGHT JOIN zt_user t3 on t3.account = t1.account\r\nWHERE t1.type = \'project\'\r\nAND t2.deleted = \'0\'\r\n) tt\r\nGROUP BY tt.`name`, tt.join\r\nORDER BY tt.join, number desc, tt.name' WHERE `id` = '1097'; UPDATE `zt_chart` SET `sql` = 'SELECT tt.join as `year`, count(1) as number, tt.setName from (\r\nselect \r\nYEAR(t1.join) as `join`, t4.name as setName \r\nfrom zt_team t1 \r\nRIGHT JOIN zt_project t2 on t2.id = t1.root\r\nLEFT JOIN zt_project t4 on FIND_IN_SET(t4.id,t2.path) and t4.grade = 1\r\nRIGHT JOIN zt_user t3 on t3.account = t1.account\r\nWHERE t1.type = \'project\'\r\nAND t2.deleted = \'0\'\r\nAND t3.deleted = \'0\'\r\n) tt\r\nGROUP BY tt.setName, tt.join\r\nORDER BY tt.join, number desc, tt.setName' WHERE `id` = '1086'; + +INSERT IGNORE INTO `zt_config` (`vision`, `owner`, `module`, `key`, `value`) VALUES ('', 'system', 'common', 'setCode', '1'); diff --git a/db/update18.2.sql b/db/update18.2.sql new file mode 100644 index 0000000000..4feb914dcc --- /dev/null +++ b/db/update18.2.sql @@ -0,0 +1,3 @@ +ALTER TABLE `zt_lang` MODIFY COLUMN `section` varchar(50) NOT NULL; +DELETE FROM `zt_grouppriv` WHERE `module` = 'dev' AND `method` = 'editor'; +REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system','common','','setPercent','1'); diff --git a/db/zentao.sql b/db/zentao.sql index 3848051d2e..047ef4fa39 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1024,7 +1024,7 @@ CREATE TABLE IF NOT EXISTS `zt_lang` ( `id` mediumint(8) unsigned NOT NULL auto_increment, `lang` varchar(30) NOT NULL, `module` varchar(30) NOT NULL, - `section` varchar(30) NOT NULL, + `section` varchar(50) NOT NULL, `key` varchar(60) NOT NULL, `value` text NOT NULL, `system` enum('0','1') NOT NULL default '1', diff --git a/doc/LICENSE.EN b/doc/LICENSE.EN index e6c758402d..090132df9b 100644 --- a/doc/LICENSE.EN +++ b/doc/LICENSE.EN @@ -11,13 +11,13 @@ Z PUBLIC LICENSE(ZPL) 1.2 Authorization -Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by EasyCorp(www.easycorp.ltd). +Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by ZenTao Software(www.easycorp.ltd). Anyone can use the agreement to publish open source software, and modify the blank in the following text of the agreement accordingly. -No other text of the agreement shall be changed. EasyCorp has the final interpretation of the terms in the agreement. +No other text of the agreement shall be changed. ZenTao Software has the final interpretation of the terms in the agreement. Preface -ZenTao ALM (Hereinafter referred to as "the software") developed by EasyCorp (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software. +ZenTao ALM (Hereinafter referred to as "the software") developed by ZenTao Software (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software. The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement. By installation of the software, you agree that a contractual relationship between you and me is automatically established. You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional agreement with me. diff --git a/doc/LICENSE.LITE.EN b/doc/LICENSE.LITE.EN index 0f5d8d8e26..d49da3944d 100644 --- a/doc/LICENSE.LITE.EN +++ b/doc/LICENSE.LITE.EN @@ -2,13 +2,13 @@ Z PUBLIC LICENSE 1.2 Authorization -Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by EasyCorp(www.easycorp.ltd). +Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by ZenTao Software(www.easycorp.ltd). Anyone can use the agreement to publish open source software, and modify the blank in the following text of the agreement accordingly. -No other text of the agreement shall be changed. EasyCorp has the final interpretation of the terms in the agreement. +No other text of the agreement shall be changed. ZenTao Software has the final interpretation of the terms in the agreement. Preface -ZenTao LITE (Hereinafter referred to as "the software") developed by EasyCorp (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software. +ZenTao LITE (Hereinafter referred to as "the software") developed by ZenTao Software (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software. The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement. By installation of the software, you agree that a contractual relationship between you and me is automatically established. You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional agreement with me. diff --git a/extension/lite/action/ext/lang/de/lite.php b/extension/lite/action/ext/lang/de/lite.php index 5de99b7955..faff3dbc75 100644 --- a/extension/lite/action/ext/lang/de/lite.php +++ b/extension/lite/action/ext/lang/de/lite.php @@ -4,11 +4,11 @@ $lang->action->label->task = 'Task|task|view|taskID=%s'; $lang->action->label->module = 'Katalog|tree|browse|productid=%s&type=story¤tModuleID=0&branch=all'; /* Object type. */ -$lang->action->objectTypes['execution'] = 'Project' . $lang->executionCommon; +$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon; $lang->action->search = new stdclass(); $lang->action->search->objectTypeList[''] = ''; -$lang->action->search->objectTypeList['project'] = 'Project'; +$lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['execution'] = 'Kanban'; $lang->action->search->objectTypeList['story'] = "$lang->SRCommon/$lang->URCommon"; $lang->action->search->objectTypeList['task'] = 'Task'; @@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory = '$date, $actor Link $lang->action->desc->unlinkparentstory = '$date, $actor From parent story$extraCanceledLink。' . "\n"; $lang->action->desc->deletechildrenstory = '$date, $actor Deleted child story$extra。' . "\n"; -$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first'; +$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first"; diff --git a/extension/lite/action/ext/lang/en/lite.php b/extension/lite/action/ext/lang/en/lite.php index 799d2dc98e..c59495ba5d 100644 --- a/extension/lite/action/ext/lang/en/lite.php +++ b/extension/lite/action/ext/lang/en/lite.php @@ -4,11 +4,11 @@ $lang->action->label->task = 'Task|task|view|taskID=%s'; $lang->action->label->module = 'Catalog|tree|browse|productid=%s&type=story¤tModuleID=0&branch=all'; /* Object type. */ -$lang->action->objectTypes['execution'] = 'Project' . $lang->executionCommon; +$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon; $lang->action->search = new stdclass(); $lang->action->search->objectTypeList[''] = ''; -$lang->action->search->objectTypeList['project'] = 'Project'; +$lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['execution'] = 'Kanban'; $lang->action->search->objectTypeList['story'] = "$lang->SRCommon/$lang->URCommon"; $lang->action->search->objectTypeList['task'] = 'Task'; @@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory = '$date, $actor Link $lang->action->desc->unlinkparentstory = '$date, $actor From parent story$extraCanceledLink。' . "\n"; $lang->action->desc->deletechildrenstory = '$date, $actor Deleted child story$extra。' . "\n"; -$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first'; +$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first"; diff --git a/extension/lite/action/ext/lang/fr/lite.php b/extension/lite/action/ext/lang/fr/lite.php index f638a8c466..aa5d3f7a22 100644 --- a/extension/lite/action/ext/lang/fr/lite.php +++ b/extension/lite/action/ext/lang/fr/lite.php @@ -4,11 +4,11 @@ $lang->action->label->task = 'Task|task|view|taskID=%s'; $lang->action->label->module = 'Table des matières|tree|browse|productid=%s&type=story¤tModuleID=0&branch=all'; /* Object type. */ -$lang->action->objectTypes['execution'] = 'Project' . $lang->executionCommon; +$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon; $lang->action->search = new stdclass(); $lang->action->search->objectTypeList[''] = ''; -$lang->action->search->objectTypeList['project'] = 'Project'; +$lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['execution'] = 'Kanban'; $lang->action->search->objectTypeList['story'] = "$lang->SRCommon/$lang->URCommon"; $lang->action->search->objectTypeList['task'] = 'Task'; @@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory = '$date, $actor Link $lang->action->desc->unlinkparentstory = '$date, $actor From parent story$extraCanceledLink。' . "\n"; $lang->action->desc->deletechildrenstory = '$date, $actor Deleted child story$extra。' . "\n"; -$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first'; +$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first"; diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php index 2c1a1e482c..24c52948ed 100644 --- a/extension/lite/action/ext/lang/zh-cn/lite.php +++ b/extension/lite/action/ext/lang/zh-cn/lite.php @@ -4,11 +4,11 @@ $lang->action->label->task = '任务|task|view|taskID=%s'; $lang->action->label->module = '目录|tree|browse|productid=%s&type=story¤tModuleID=0&branch=all'; /* Object type. */ -$lang->action->objectTypes['execution'] = '项目' . $lang->executionCommon; +$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon; $lang->action->search = new stdclass(); $lang->action->search->objectTypeList[''] = ''; -$lang->action->search->objectTypeList['project'] = '项目'; +$lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['execution'] = '看板'; $lang->action->search->objectTypeList['story'] = "目标"; $lang->action->search->objectTypeList['task'] = '任务'; @@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory = '$date, 由 $actor $lang->action->desc->unlinkparentstory = '$date, 由 $actor 从父目标$extra取消关联。' . "\n"; $lang->action->desc->deletechildrenstory = '$date, 由 $actor 删除子目标$extra。' . "\n"; -$lang->action->executionNoProject = '该项目看板没有所属的项目，请先还原项目再还原项目看板'; +$lang->action->executionNoProject = "该{$lang->projectCommon}看板没有所属的{$lang->projectCommon}，请先还原{$lang->projectCommon}再还原{$lang->projectCommon}看板"; diff --git a/extension/lite/attend/ext/view/personal.html.php b/extension/lite/attend/ext/view/personal.html.php index 45d98a3d15..bf8ec2f521 100644 --- a/extension/lite/attend/ext/view/personal.html.php +++ b/extension/lite/attend/ext/view/personal.html.php @@ -20,15 +20,10 @@ diff --git a/extension/lite/block/ext/lang/de/lite.php b/extension/lite/block/ext/lang/de/lite.php index 2b2566c658..ff2e678e75 100644 --- a/extension/lite/block/ext/lang/de/lite.php +++ b/extension/lite/block/ext/lang/de/lite.php @@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count'] = '15'; $lang->block->modules['kanban']['index'] = new stdclass(); $lang->block->modules['kanban']['index']->availableBlocks = new stdclass(); -$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = 'Project Overview'; +$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = "{$lang->projectCommon} Overview"; $lang->block->modules['kanban']['index']->availableBlocks->scrumlist = $lang->executionCommon . ' List'; $lang->block->modules['kanban']['index']->availableBlocks->sprint = $lang->executionCommon . ' Overview'; $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon} List"; $lang->block->modules['execution'] = new stdclass(); $lang->block->modules['execution']->availableBlocks = new stdclass(); diff --git a/extension/lite/block/ext/lang/en/lite.php b/extension/lite/block/ext/lang/en/lite.php index 2b2566c658..ff2e678e75 100644 --- a/extension/lite/block/ext/lang/en/lite.php +++ b/extension/lite/block/ext/lang/en/lite.php @@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count'] = '15'; $lang->block->modules['kanban']['index'] = new stdclass(); $lang->block->modules['kanban']['index']->availableBlocks = new stdclass(); -$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = 'Project Overview'; +$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = "{$lang->projectCommon} Overview"; $lang->block->modules['kanban']['index']->availableBlocks->scrumlist = $lang->executionCommon . ' List'; $lang->block->modules['kanban']['index']->availableBlocks->sprint = $lang->executionCommon . ' Overview'; $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon} List"; $lang->block->modules['execution'] = new stdclass(); $lang->block->modules['execution']->availableBlocks = new stdclass(); diff --git a/extension/lite/block/ext/lang/fr/lite.php b/extension/lite/block/ext/lang/fr/lite.php index 2b2566c658..ff2e678e75 100644 --- a/extension/lite/block/ext/lang/fr/lite.php +++ b/extension/lite/block/ext/lang/fr/lite.php @@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count'] = '15'; $lang->block->modules['kanban']['index'] = new stdclass(); $lang->block->modules['kanban']['index']->availableBlocks = new stdclass(); -$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = 'Project Overview'; +$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = "{$lang->projectCommon} Overview"; $lang->block->modules['kanban']['index']->availableBlocks->scrumlist = $lang->executionCommon . ' List'; $lang->block->modules['kanban']['index']->availableBlocks->sprint = $lang->executionCommon . ' Overview'; $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon} List"; $lang->block->modules['execution'] = new stdclass(); $lang->block->modules['execution']->availableBlocks = new stdclass(); diff --git a/extension/lite/block/ext/lang/zh-cn/lite.php b/extension/lite/block/ext/lang/zh-cn/lite.php index 4c60831543..96983d404a 100644 --- a/extension/lite/block/ext/lang/zh-cn/lite.php +++ b/extension/lite/block/ext/lang/zh-cn/lite.php @@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count'] = '15'; $lang->block->modules['kanban']['index'] = new stdclass(); $lang->block->modules['kanban']['index']->availableBlocks = new stdclass(); -$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = '项目概况'; +$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview = "{$lang->projectCommon}概况"; $lang->block->modules['kanban']['index']->availableBlocks->scrumlist = $lang->executionCommon . '列表'; $lang->block->modules['kanban']['index']->availableBlocks->sprint = $lang->executionCommon . '总览'; $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = '最新动态'; $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->project = '项目列表'; +$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon}列表"; $lang->block->modules['execution'] = new stdclass(); $lang->block->modules['execution']->availableBlocks = new stdclass(); diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php index ef7b1da49c..5aaca40bd0 100644 --- a/extension/lite/common/ext/lang/de/lite.php +++ b/extension/lite/common/ext/lang/de/lite.php @@ -7,7 +7,7 @@ $lang->story->common = 'Story'; /* Main Navigation. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|"; -$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|"; +$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|"; $lang->mainNav->execution = "{$lang->navIcons['execution']} Task|$executionModule|$executionMethod|"; $lang->mainNav->kanban = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|"; $lang->mainNav->doc = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|"; @@ -30,7 +30,7 @@ if($config->edition != 'open') /* Menu order. */ $lang->mainNav->menuOrder = array(); $lang->mainNav->menuOrder[5] = 'my'; -$lang->mainNav->menuOrder[10] = 'project'; +$lang->mainNav->menuOrder[10] = $lang->projectCommon; $lang->mainNav->menuOrder[15] = 'kanban'; $lang->mainNav->menuOrder[35] = 'doc'; $lang->mainNav->menuOrder[45] = 'system'; @@ -137,27 +137,30 @@ $lang->doc->menuOrder[5] = 'dashboard'; $lang->doc->menuOrder[10] = 'recent'; $lang->doc->menuOrder[15] = 'my'; $lang->doc->menuOrder[20] = 'collect'; -$lang->doc->menuOrder[25] = 'project'; +$lang->doc->menuOrder[25] = $lang->projectCommon; $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +/* Admin menu. */ +$lang->admin->menu = new stdclass(); + /* adjust items of search. */ $lang->searchObjects['all'] = 'All'; $lang->searchObjects['todo'] = 'Todo'; $lang->searchObjects['story'] = 'Story'; $lang->searchObjects['task'] = 'Task'; $lang->searchObjects['doc'] = 'Doc'; -$lang->searchObjects['project'] = 'Project'; +$lang->searchObjects['project'] = $lang->projectCommon; $lang->searchObjects['execution'] = 'Kanban'; $lang->searchObjects['user'] = 'User'; if($config->edition != 'open') $lang->searchObjects['feedback'] = 'Feedback'; if($config->visions == ',lite,') unset($lang->searchObjects['feedback']); -$lang->navGroup->task = 'project'; -$lang->navGroup->execution = 'project'; +$lang->navGroup->task = $lang->projectCommon; +$lang->navGroup->execution = $lang->projectCommon; unset($lang->searchObjects['bug']); unset($lang->searchObjects['testcase']); diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index ef7b1da49c..5aaca40bd0 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -7,7 +7,7 @@ $lang->story->common = 'Story'; /* Main Navigation. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|"; -$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|"; +$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|"; $lang->mainNav->execution = "{$lang->navIcons['execution']} Task|$executionModule|$executionMethod|"; $lang->mainNav->kanban = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|"; $lang->mainNav->doc = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|"; @@ -30,7 +30,7 @@ if($config->edition != 'open') /* Menu order. */ $lang->mainNav->menuOrder = array(); $lang->mainNav->menuOrder[5] = 'my'; -$lang->mainNav->menuOrder[10] = 'project'; +$lang->mainNav->menuOrder[10] = $lang->projectCommon; $lang->mainNav->menuOrder[15] = 'kanban'; $lang->mainNav->menuOrder[35] = 'doc'; $lang->mainNav->menuOrder[45] = 'system'; @@ -137,27 +137,30 @@ $lang->doc->menuOrder[5] = 'dashboard'; $lang->doc->menuOrder[10] = 'recent'; $lang->doc->menuOrder[15] = 'my'; $lang->doc->menuOrder[20] = 'collect'; -$lang->doc->menuOrder[25] = 'project'; +$lang->doc->menuOrder[25] = $lang->projectCommon; $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +/* Admin menu. */ +$lang->admin->menu = new stdclass(); + /* adjust items of search. */ $lang->searchObjects['all'] = 'All'; $lang->searchObjects['todo'] = 'Todo'; $lang->searchObjects['story'] = 'Story'; $lang->searchObjects['task'] = 'Task'; $lang->searchObjects['doc'] = 'Doc'; -$lang->searchObjects['project'] = 'Project'; +$lang->searchObjects['project'] = $lang->projectCommon; $lang->searchObjects['execution'] = 'Kanban'; $lang->searchObjects['user'] = 'User'; if($config->edition != 'open') $lang->searchObjects['feedback'] = 'Feedback'; if($config->visions == ',lite,') unset($lang->searchObjects['feedback']); -$lang->navGroup->task = 'project'; -$lang->navGroup->execution = 'project'; +$lang->navGroup->task = $lang->projectCommon; +$lang->navGroup->execution = $lang->projectCommon; unset($lang->searchObjects['bug']); unset($lang->searchObjects['testcase']); diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php index ef7b1da49c..5aaca40bd0 100644 --- a/extension/lite/common/ext/lang/fr/lite.php +++ b/extension/lite/common/ext/lang/fr/lite.php @@ -7,7 +7,7 @@ $lang->story->common = 'Story'; /* Main Navigation. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|"; -$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|"; +$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|"; $lang->mainNav->execution = "{$lang->navIcons['execution']} Task|$executionModule|$executionMethod|"; $lang->mainNav->kanban = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|"; $lang->mainNav->doc = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|"; @@ -30,7 +30,7 @@ if($config->edition != 'open') /* Menu order. */ $lang->mainNav->menuOrder = array(); $lang->mainNav->menuOrder[5] = 'my'; -$lang->mainNav->menuOrder[10] = 'project'; +$lang->mainNav->menuOrder[10] = $lang->projectCommon; $lang->mainNav->menuOrder[15] = 'kanban'; $lang->mainNav->menuOrder[35] = 'doc'; $lang->mainNav->menuOrder[45] = 'system'; @@ -137,27 +137,30 @@ $lang->doc->menuOrder[5] = 'dashboard'; $lang->doc->menuOrder[10] = 'recent'; $lang->doc->menuOrder[15] = 'my'; $lang->doc->menuOrder[20] = 'collect'; -$lang->doc->menuOrder[25] = 'project'; +$lang->doc->menuOrder[25] = $lang->projectCommon; $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +/* Admin menu. */ +$lang->admin->menu = new stdclass(); + /* adjust items of search. */ $lang->searchObjects['all'] = 'All'; $lang->searchObjects['todo'] = 'Todo'; $lang->searchObjects['story'] = 'Story'; $lang->searchObjects['task'] = 'Task'; $lang->searchObjects['doc'] = 'Doc'; -$lang->searchObjects['project'] = 'Project'; +$lang->searchObjects['project'] = $lang->projectCommon; $lang->searchObjects['execution'] = 'Kanban'; $lang->searchObjects['user'] = 'User'; if($config->edition != 'open') $lang->searchObjects['feedback'] = 'Feedback'; if($config->visions == ',lite,') unset($lang->searchObjects['feedback']); -$lang->navGroup->task = 'project'; -$lang->navGroup->execution = 'project'; +$lang->navGroup->task = $lang->projectCommon; +$lang->navGroup->execution = $lang->projectCommon; unset($lang->searchObjects['bug']); unset($lang->searchObjects['testcase']); diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index dd43e3aeca..14ec03eca2 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -7,7 +7,7 @@ $lang->story->common = '目标'; /* Main Navigation. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|"; -$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|"; +$lang->mainNav->project = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|"; $lang->mainNav->execution = "{$lang->navIcons['execution']} 任务|$executionModule|$executionMethod|"; $lang->mainNav->kanban = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|"; $lang->mainNav->doc = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|"; @@ -143,13 +143,16 @@ $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +/* Admin menu. */ +$lang->admin->menu = new stdclass(); + /* adjust items of search. */ $lang->searchObjects['all'] = '全部'; $lang->searchObjects['todo'] = '待办'; $lang->searchObjects['story'] = '目标'; $lang->searchObjects['task'] = '任务'; $lang->searchObjects['doc'] = '文档'; -$lang->searchObjects['project'] = '项目'; +$lang->searchObjects['project'] = $lang->projectCommon; $lang->searchObjects['execution'] = '看板'; $lang->searchObjects['user'] = '用户'; diff --git a/extension/lite/company/ext/lang/de/lite.php b/extension/lite/company/ext/lang/de/lite.php index 5e6c107296..7e71bc3dad 100644 --- a/extension/lite/company/ext/lang/de/lite.php +++ b/extension/lite/company/ext/lang/de/lite.php @@ -1,3 +1,3 @@ company->execution = 'Kanban'; -$lang->company->product = 'Project'; +$lang->company->product = $lang->projectCommon; diff --git a/extension/lite/company/ext/lang/en/lite.php b/extension/lite/company/ext/lang/en/lite.php index 5e6c107296..7e71bc3dad 100644 --- a/extension/lite/company/ext/lang/en/lite.php +++ b/extension/lite/company/ext/lang/en/lite.php @@ -1,3 +1,3 @@ company->execution = 'Kanban'; -$lang->company->product = 'Project'; +$lang->company->product = $lang->projectCommon; diff --git a/extension/lite/company/ext/lang/fr/lite.php b/extension/lite/company/ext/lang/fr/lite.php index 5e6c107296..7e71bc3dad 100644 --- a/extension/lite/company/ext/lang/fr/lite.php +++ b/extension/lite/company/ext/lang/fr/lite.php @@ -1,3 +1,3 @@ company->execution = 'Kanban'; -$lang->company->product = 'Project'; +$lang->company->product = $lang->projectCommon; diff --git a/extension/lite/company/ext/lang/zh-cn/lite.php b/extension/lite/company/ext/lang/zh-cn/lite.php index f09b1918cf..82d069353e 100644 --- a/extension/lite/company/ext/lang/zh-cn/lite.php +++ b/extension/lite/company/ext/lang/zh-cn/lite.php @@ -1,3 +1,3 @@ company->execution = '看板'; -$lang->company->product = '项目'; +$lang->company->product = $lang->projectCommon; diff --git a/extension/lite/dev/ext/lang/de/lite.php b/extension/lite/dev/ext/lang/de/lite.php index 3521a92056..8af156a1a6 100644 --- a/extension/lite/dev/ext/lang/de/lite.php +++ b/extension/lite/dev/ext/lang/de/lite.php @@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv'] = 'Group Privilege'; $lang->dev->tableList['history'] = 'History'; $lang->dev->tableList['lang'] = 'Language'; $lang->dev->tableList['module'] = 'Module'; -$lang->dev->tableList['project'] = 'Project'; -$lang->dev->tableList['projectproduct'] = 'Project' . $lang->productCommon; -$lang->dev->tableList['projectstory'] = 'Project' . $lang->SRCommon; +$lang->dev->tableList['project'] = $lang->projectCommon; +$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon; +$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->SRCommon; $lang->dev->tableList['execution'] = $lang->executionCommon; $lang->dev->tableList['story'] = $lang->SRCommon; $lang->dev->tableList['storyspec'] = "{$lang->SRCommon} Description"; @@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice'] = 'Im User Device'; $lang->dev->groupList = array(); $lang->dev->groupList['my'] = 'My'; -$lang->dev->groupList['project'] = 'Project'; +$lang->dev->groupList['project'] = $lang->projectCommon; $lang->dev->groupList['execution'] = $lang->executionCommon; $lang->dev->groupList['doc'] = 'Document'; $lang->dev->groupList['company'] = 'Company'; diff --git a/extension/lite/dev/ext/lang/en/lite.php b/extension/lite/dev/ext/lang/en/lite.php index 3521a92056..8af156a1a6 100644 --- a/extension/lite/dev/ext/lang/en/lite.php +++ b/extension/lite/dev/ext/lang/en/lite.php @@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv'] = 'Group Privilege'; $lang->dev->tableList['history'] = 'History'; $lang->dev->tableList['lang'] = 'Language'; $lang->dev->tableList['module'] = 'Module'; -$lang->dev->tableList['project'] = 'Project'; -$lang->dev->tableList['projectproduct'] = 'Project' . $lang->productCommon; -$lang->dev->tableList['projectstory'] = 'Project' . $lang->SRCommon; +$lang->dev->tableList['project'] = $lang->projectCommon; +$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon; +$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->SRCommon; $lang->dev->tableList['execution'] = $lang->executionCommon; $lang->dev->tableList['story'] = $lang->SRCommon; $lang->dev->tableList['storyspec'] = "{$lang->SRCommon} Description"; @@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice'] = 'Im User Device'; $lang->dev->groupList = array(); $lang->dev->groupList['my'] = 'My'; -$lang->dev->groupList['project'] = 'Project'; +$lang->dev->groupList['project'] = $lang->projectCommon; $lang->dev->groupList['execution'] = $lang->executionCommon; $lang->dev->groupList['doc'] = 'Document'; $lang->dev->groupList['company'] = 'Company'; diff --git a/extension/lite/dev/ext/lang/fr/lite.php b/extension/lite/dev/ext/lang/fr/lite.php index 3521a92056..8af156a1a6 100644 --- a/extension/lite/dev/ext/lang/fr/lite.php +++ b/extension/lite/dev/ext/lang/fr/lite.php @@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv'] = 'Group Privilege'; $lang->dev->tableList['history'] = 'History'; $lang->dev->tableList['lang'] = 'Language'; $lang->dev->tableList['module'] = 'Module'; -$lang->dev->tableList['project'] = 'Project'; -$lang->dev->tableList['projectproduct'] = 'Project' . $lang->productCommon; -$lang->dev->tableList['projectstory'] = 'Project' . $lang->SRCommon; +$lang->dev->tableList['project'] = $lang->projectCommon; +$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon; +$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->SRCommon; $lang->dev->tableList['execution'] = $lang->executionCommon; $lang->dev->tableList['story'] = $lang->SRCommon; $lang->dev->tableList['storyspec'] = "{$lang->SRCommon} Description"; @@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice'] = 'Im User Device'; $lang->dev->groupList = array(); $lang->dev->groupList['my'] = 'My'; -$lang->dev->groupList['project'] = 'Project'; +$lang->dev->groupList['project'] = $lang->projectCommon; $lang->dev->groupList['execution'] = $lang->executionCommon; $lang->dev->groupList['doc'] = 'Document'; $lang->dev->groupList['company'] = 'Company'; diff --git a/extension/lite/dev/ext/lang/zh-cn/lite.php b/extension/lite/dev/ext/lang/zh-cn/lite.php index 176a623270..b0916fd876 100644 --- a/extension/lite/dev/ext/lang/zh-cn/lite.php +++ b/extension/lite/dev/ext/lang/zh-cn/lite.php @@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv'] = '组权限'; $lang->dev->tableList['history'] = '操作历史'; $lang->dev->tableList['lang'] = '语言定义'; $lang->dev->tableList['module'] = '模块'; -$lang->dev->tableList['project'] = '项目'; -$lang->dev->tableList['projectproduct'] = '项目' . $lang->productCommon; -$lang->dev->tableList['projectstory'] = '项目' . $lang->SRCommon; +$lang->dev->tableList['project'] = $lang->projectCommon; +$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon; +$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->SRCommon; $lang->dev->tableList['execution'] = $lang->executionCommon; $lang->dev->tableList['story'] = $lang->SRCommon; $lang->dev->tableList['storyspec'] = "{$lang->SRCommon}描述"; @@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice'] = 'im用户设备'; $lang->dev->groupList = array(); $lang->dev->groupList['my'] = '我的地盘'; -$lang->dev->groupList['project'] = '项目'; +$lang->dev->groupList['project'] = $lang->projectCommon; $lang->dev->groupList['execution'] = $lang->executionCommon; $lang->dev->groupList['doc'] = '文档'; $lang->dev->groupList['company'] = '组织'; diff --git a/extension/lite/doc/ext/lang/de/lite.php b/extension/lite/doc/ext/lang/de/lite.php index e1084db219..f978274997 100644 --- a/extension/lite/doc/ext/lang/de/lite.php +++ b/extension/lite/doc/ext/lang/de/lite.php @@ -1,4 +1,4 @@ doc->libTypeList = array(); -$lang->doc->libTypeList['project'] = 'Project Library'; +$lang->doc->libTypeList['project'] = "{$lang->projectCommon} Library"; $lang->doc->libTypeList['custom'] = 'Custom Library'; diff --git a/extension/lite/doc/ext/lang/en/lite.php b/extension/lite/doc/ext/lang/en/lite.php index e1084db219..f978274997 100644 --- a/extension/lite/doc/ext/lang/en/lite.php +++ b/extension/lite/doc/ext/lang/en/lite.php @@ -1,4 +1,4 @@ doc->libTypeList = array(); -$lang->doc->libTypeList['project'] = 'Project Library'; +$lang->doc->libTypeList['project'] = "{$lang->projectCommon} Library"; $lang->doc->libTypeList['custom'] = 'Custom Library'; diff --git a/extension/lite/doc/ext/lang/fr/lite.php b/extension/lite/doc/ext/lang/fr/lite.php index e1084db219..f978274997 100644 --- a/extension/lite/doc/ext/lang/fr/lite.php +++ b/extension/lite/doc/ext/lang/fr/lite.php @@ -1,4 +1,4 @@ doc->libTypeList = array(); -$lang->doc->libTypeList['project'] = 'Project Library'; +$lang->doc->libTypeList['project'] = "{$lang->projectCommon} Library"; $lang->doc->libTypeList['custom'] = 'Custom Library'; diff --git a/extension/lite/doc/ext/lang/zh-cn/lite.php b/extension/lite/doc/ext/lang/zh-cn/lite.php index f6d01c3474..bc3d8bfaf3 100644 --- a/extension/lite/doc/ext/lang/zh-cn/lite.php +++ b/extension/lite/doc/ext/lang/zh-cn/lite.php @@ -1,4 +1,4 @@ doc->libTypeList = array(); -$lang->doc->libTypeList['project'] = '项目文档库'; +$lang->doc->libTypeList['project'] = "{$lang->projectCommon}文档库"; $lang->doc->libTypeList['custom'] = '自定义文档库'; diff --git a/extension/lite/execution/ext/lang/de/lite.php b/extension/lite/execution/ext/lang/de/lite.php index 5eba267b99..1c5a05ff81 100644 --- a/extension/lite/execution/ext/lang/de/lite.php +++ b/extension/lite/execution/ext/lang/de/lite.php @@ -22,6 +22,6 @@ $lang->execution->icons['gantt'] = 'lane'; $lang->execution->icons['tree'] = 'treemap'; $lang->execution->icons['grouptask'] = 'sitemap'; -$lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)"; +$lang->execution->aclList['private'] = "Private (Accessible to team members and {$lang->projectCommon} leaders)"; -$lang->execution->common = 'Project Execution'; +$lang->execution->common = "{$lang->projectCommon} Execution"; diff --git a/extension/lite/execution/ext/lang/en/lite.php b/extension/lite/execution/ext/lang/en/lite.php index 5eba267b99..1c5a05ff81 100644 --- a/extension/lite/execution/ext/lang/en/lite.php +++ b/extension/lite/execution/ext/lang/en/lite.php @@ -22,6 +22,6 @@ $lang->execution->icons['gantt'] = 'lane'; $lang->execution->icons['tree'] = 'treemap'; $lang->execution->icons['grouptask'] = 'sitemap'; -$lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)"; +$lang->execution->aclList['private'] = "Private (Accessible to team members and {$lang->projectCommon} leaders)"; -$lang->execution->common = 'Project Execution'; +$lang->execution->common = "{$lang->projectCommon} Execution"; diff --git a/extension/lite/execution/ext/lang/fr/lite.php b/extension/lite/execution/ext/lang/fr/lite.php index 5eba267b99..1c5a05ff81 100644 --- a/extension/lite/execution/ext/lang/fr/lite.php +++ b/extension/lite/execution/ext/lang/fr/lite.php @@ -22,6 +22,6 @@ $lang->execution->icons['gantt'] = 'lane'; $lang->execution->icons['tree'] = 'treemap'; $lang->execution->icons['grouptask'] = 'sitemap'; -$lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)"; +$lang->execution->aclList['private'] = "Private (Accessible to team members and {$lang->projectCommon} leaders)"; -$lang->execution->common = 'Project Execution'; +$lang->execution->common = "{$lang->projectCommon} Execution"; diff --git a/extension/lite/execution/ext/lang/zh-cn/lite.php b/extension/lite/execution/ext/lang/zh-cn/lite.php index 268f3efa1b..098fe779d5 100644 --- a/extension/lite/execution/ext/lang/zh-cn/lite.php +++ b/extension/lite/execution/ext/lang/zh-cn/lite.php @@ -22,6 +22,6 @@ $lang->execution->icons['gantt'] = 'lane'; $lang->execution->icons['tree'] = 'treemap'; $lang->execution->icons['grouptask'] = 'sitemap'; -$lang->execution->aclList['private'] = "私有（团队成员和项目负责人可访问）"; +$lang->execution->aclList['private'] = "私有（团队成员和{$lang->projectCommon}负责人可访问）"; -$lang->execution->common = '项目看板'; +$lang->execution->common = "{$lang->projectCommon}看板"; diff --git a/extension/lite/install/ext/lang/de/lite.php b/extension/lite/install/ext/lang/de/lite.php index c190378e52..217460939d 100644 --- a/extension/lite/install/ext/lang/de/lite.php +++ b/extension/lite/install/ext/lang/de/lite.php @@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma EOT; $lang->install->links = <<EasyCorp. +ZenTao Lite is developed by ZenTao Software. Official Website: https://www.zentao.pm Technical Support: https://www.zentao.pm/forum/ -LinkedIn: EasyCorp -Facebook: EasyCorp +LinkedIn: ZenTao Software +Facebook: ZenTao Software Twitter: ZenTao Lite diff --git a/extension/lite/install/ext/lang/en/lite.php b/extension/lite/install/ext/lang/en/lite.php index c190378e52..217460939d 100644 --- a/extension/lite/install/ext/lang/en/lite.php +++ b/extension/lite/install/ext/lang/en/lite.php @@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma EOT; $lang->install->links = <<EasyCorp. +ZenTao Lite is developed by ZenTao Software. Official Website: https://www.zentao.pm Technical Support: https://www.zentao.pm/forum/ -LinkedIn: EasyCorp -Facebook: EasyCorp +LinkedIn: ZenTao Software +Facebook: ZenTao Software Twitter: ZenTao Lite diff --git a/extension/lite/install/ext/lang/fr/lite.php b/extension/lite/install/ext/lang/fr/lite.php index c190378e52..217460939d 100644 --- a/extension/lite/install/ext/lang/fr/lite.php +++ b/extension/lite/install/ext/lang/fr/lite.php @@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma EOT; $lang->install->links = <<EasyCorp. +ZenTao Lite is developed by ZenTao Software. Official Website: https://www.zentao.pm Technical Support: https://www.zentao.pm/forum/ -LinkedIn: EasyCorp -Facebook: EasyCorp +LinkedIn: ZenTao Software +Facebook: ZenTao Software Twitter: ZenTao Lite diff --git a/extension/lite/my/ext/lang/de/lite.php b/extension/lite/my/ext/lang/de/lite.php new file mode 100644 index 0000000000..7364652099 --- /dev/null +++ b/extension/lite/my/ext/lang/de/lite.php @@ -0,0 +1,7 @@ +my->featureBar['contribute']['task'] = array(); +$lang->my->featureBar['contribute']['task']['assignedTo'] = 'AssignedToMe'; +$lang->my->featureBar['contribute']['task']['openedBy'] = 'CreatedByMe'; +$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe'; +$lang->my->featureBar['contribute']['task']['closedBy'] = 'ClosedByMe'; +$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe'; diff --git a/extension/lite/my/ext/lang/en/lite.php b/extension/lite/my/ext/lang/en/lite.php new file mode 100644 index 0000000000..7364652099 --- /dev/null +++ b/extension/lite/my/ext/lang/en/lite.php @@ -0,0 +1,7 @@ +my->featureBar['contribute']['task'] = array(); +$lang->my->featureBar['contribute']['task']['assignedTo'] = 'AssignedToMe'; +$lang->my->featureBar['contribute']['task']['openedBy'] = 'CreatedByMe'; +$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe'; +$lang->my->featureBar['contribute']['task']['closedBy'] = 'ClosedByMe'; +$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe'; diff --git a/extension/lite/my/ext/lang/fr/lite.php b/extension/lite/my/ext/lang/fr/lite.php new file mode 100644 index 0000000000..7364652099 --- /dev/null +++ b/extension/lite/my/ext/lang/fr/lite.php @@ -0,0 +1,7 @@ +my->featureBar['contribute']['task'] = array(); +$lang->my->featureBar['contribute']['task']['assignedTo'] = 'AssignedToMe'; +$lang->my->featureBar['contribute']['task']['openedBy'] = 'CreatedByMe'; +$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe'; +$lang->my->featureBar['contribute']['task']['closedBy'] = 'ClosedByMe'; +$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe'; diff --git a/extension/lite/my/ext/lang/zh-cn/lite.php b/extension/lite/my/ext/lang/zh-cn/lite.php new file mode 100644 index 0000000000..f3116c38e5 --- /dev/null +++ b/extension/lite/my/ext/lang/zh-cn/lite.php @@ -0,0 +1,7 @@ +my->featureBar['contribute']['task'] = array(); +$lang->my->featureBar['contribute']['task']['assignedTo'] = '指派给我'; +$lang->my->featureBar['contribute']['task']['openedBy'] = '由我创建'; +$lang->my->featureBar['contribute']['task']['finishedBy'] = '由我完成'; +$lang->my->featureBar['contribute']['task']['closedBy'] = '由我关闭'; +$lang->my->featureBar['contribute']['task']['canceledBy'] = '由我取消'; diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php index ae4eb268fc..2742bd5f3a 100644 --- a/extension/lite/my/ext/view/task.html.php +++ b/extension/lite/my/ext/view/task.html.php @@ -19,11 +19,10 @@ {$pager->recTotal}"; ?> rawMethod == 'contribute'):?> rawMethod, "mode=$mode&type=assignedTo"), "{$lang->my->taskMenu->assignedToMe}" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'"); - echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"), "{$lang->my->taskMenu->openedByMe}" . ($type == 'openedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' ? ' btn-active-text' : '') . "'"); - echo html::a(inlink($app->rawMethod, "mode=$mode&type=finishedBy"), "{$lang->my->taskMenu->finishedByMe}" . ($type == 'finishedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'finishedBy' ? ' btn-active-text' : '') . "'"); - echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"), "{$lang->my->taskMenu->closedByMe}" . ($type == 'closedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy' ? ' btn-active-text' : '') . "'"); - echo html::a(inlink($app->rawMethod, "mode=$mode&type=canceledBy"), "{$lang->my->taskMenu->canceledByMe}" . ($type == 'canceledBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'canceledBy' ? ' btn-active-text' : '') . "'"); + foreach($lang->my->featureBar[$app->rawMethod]['task'] as $key => $name) + { + echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), "{$name}" . ($type == $key ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $key ? ' btn-active-text' : '') . "'"); + } ?> diff --git a/extension/lite/project/ext/lang/de/lite.php b/extension/lite/project/ext/lang/de/lite.php index cd8e094b83..3f4dd0fa95 100644 --- a/extension/lite/project/ext/lang/de/lite.php +++ b/extension/lite/project/ext/lang/de/lite.php @@ -4,4 +4,4 @@ $lang->project->doingExecutions = 'Doing Kanban'; $lang->project->select = "Select {$lang->project->common}"; $lang->project->noProject = "No {$lang->project->common} yet. "; -$lang->project->aclList['private'] = "Private (Accessible to project leaders and team members)"; +$lang->project->aclList['private'] = "Private (Accessible to {$lang->projectCommon} leaders and team members)"; diff --git a/extension/lite/project/ext/lang/en/lite.php b/extension/lite/project/ext/lang/en/lite.php index cd8e094b83..3f4dd0fa95 100644 --- a/extension/lite/project/ext/lang/en/lite.php +++ b/extension/lite/project/ext/lang/en/lite.php @@ -4,4 +4,4 @@ $lang->project->doingExecutions = 'Doing Kanban'; $lang->project->select = "Select {$lang->project->common}"; $lang->project->noProject = "No {$lang->project->common} yet. "; -$lang->project->aclList['private'] = "Private (Accessible to project leaders and team members)"; +$lang->project->aclList['private'] = "Private (Accessible to {$lang->projectCommon} leaders and team members)"; diff --git a/extension/lite/project/ext/lang/fr/lite.php b/extension/lite/project/ext/lang/fr/lite.php index cd8e094b83..3f4dd0fa95 100644 --- a/extension/lite/project/ext/lang/fr/lite.php +++ b/extension/lite/project/ext/lang/fr/lite.php @@ -4,4 +4,4 @@ $lang->project->doingExecutions = 'Doing Kanban'; $lang->project->select = "Select {$lang->project->common}"; $lang->project->noProject = "No {$lang->project->common} yet. "; -$lang->project->aclList['private'] = "Private (Accessible to project leaders and team members)"; +$lang->project->aclList['private'] = "Private (Accessible to {$lang->projectCommon} leaders and team members)"; diff --git a/extension/lite/project/ext/lang/zh-cn/lite.php b/extension/lite/project/ext/lang/zh-cn/lite.php index 109b554f69..ff31eedd46 100644 --- a/extension/lite/project/ext/lang/zh-cn/lite.php +++ b/extension/lite/project/ext/lang/zh-cn/lite.php @@ -4,4 +4,4 @@ $lang->project->doingExecutions = '进行中的看板(最近1个)'; $lang->project->select = "请选择{$lang->project->common}"; $lang->project->noProject = "暂时没有{$lang->project->common}。"; -$lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员可访问)"; +$lang->project->aclList['private'] = "私有 (只有{$lang->projectCommon}负责人、团队成员可访问)"; diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index e58cc8031d..139bd30f69 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -14,7 +14,7 @@