+
+ 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/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 32b9d67573..5aaca40bd0 100644 --- a/extension/lite/common/ext/lang/de/lite.php +++ b/extension/lite/common/ext/lang/de/lite.php @@ -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,7 +137,7 @@ $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(); @@ -152,15 +152,15 @@ $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 32b9d67573..5aaca40bd0 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -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,7 +137,7 @@ $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(); @@ -152,15 +152,15 @@ $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 32b9d67573..5aaca40bd0 100644 --- a/extension/lite/common/ext/lang/fr/lite.php +++ b/extension/lite/common/ext/lang/fr/lite.php @@ -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,7 +137,7 @@ $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(); @@ -152,15 +152,15 @@ $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 39dbd0bf2c..14ec03eca2 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -152,7 +152,7 @@ $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/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/task/ext/lang/de/lite.php b/extension/lite/task/ext/lang/de/lite.php index fd2960d8e1..a4f0b3a012 100644 --- a/extension/lite/task/ext/lang/de/lite.php +++ b/extension/lite/task/ext/lang/de/lite.php @@ -61,7 +61,7 @@ $lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the t $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to transfer task?'; $lang->task->noTask = 'No tasks yet. '; $lang->task->kanbanDenied = 'Please create a Kanban first'; -$lang->task->createDenied = 'Create Task is denied in this project'; +$lang->task->createDenied = "Create Task is denied in this {$lang->projectCommon}"; $lang->task->cannotDeleteParent = 'Cannot delete parent task'; $lang->task->addChildTask = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.'; diff --git a/extension/lite/task/ext/lang/en/lite.php b/extension/lite/task/ext/lang/en/lite.php index fd2960d8e1..a4f0b3a012 100644 --- a/extension/lite/task/ext/lang/en/lite.php +++ b/extension/lite/task/ext/lang/en/lite.php @@ -61,7 +61,7 @@ $lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the t $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to transfer task?'; $lang->task->noTask = 'No tasks yet. '; $lang->task->kanbanDenied = 'Please create a Kanban first'; -$lang->task->createDenied = 'Create Task is denied in this project'; +$lang->task->createDenied = "Create Task is denied in this {$lang->projectCommon}"; $lang->task->cannotDeleteParent = 'Cannot delete parent task'; $lang->task->addChildTask = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.'; diff --git a/extension/lite/task/ext/lang/fr/lite.php b/extension/lite/task/ext/lang/fr/lite.php index fd2960d8e1..a4f0b3a012 100644 --- a/extension/lite/task/ext/lang/fr/lite.php +++ b/extension/lite/task/ext/lang/fr/lite.php @@ -61,7 +61,7 @@ $lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the t $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to transfer task?'; $lang->task->noTask = 'No tasks yet. '; $lang->task->kanbanDenied = 'Please create a Kanban first'; -$lang->task->createDenied = 'Create Task is denied in this project'; +$lang->task->createDenied = "Create Task is denied in this {$lang->projectCommon}"; $lang->task->cannotDeleteParent = 'Cannot delete parent task'; $lang->task->addChildTask = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.'; diff --git a/extension/lite/task/ext/lang/zh-cn/lite.php b/extension/lite/task/ext/lang/zh-cn/lite.php index d90924f223..a8e772b5d3 100644 --- a/extension/lite/task/ext/lang/zh-cn/lite.php +++ b/extension/lite/task/ext/lang/zh-cn/lite.php @@ -61,7 +61,7 @@ $lang->task->confirmRecord = '"剩余"为0,任务将标记为"已完 $lang->task->confirmTransfer = '"当前剩余"为0,任务将被转交,您确定吗?'; $lang->task->noTask = '暂时没有任务。'; $lang->task->kanbanDenied = '请先创建看板'; -$lang->task->createDenied = '你不能在该项目添加任务'; +$lang->task->createDenied = "你不能在该{$lang->projectCommon}添加任务"; $lang->task->cannotDeleteParent = '不能删除父任务。'; $lang->task->addChildTask = '因该任务已经产生消耗,为保证数据一致性,我们会帮您创建一条同名子任务记录该消耗。'; diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php index a32c400872..55774724ab 100644 --- a/lib/base/front/front.class.php +++ b/lib/base/front/front.class.php @@ -330,7 +330,8 @@ class baseHTML */ static public function hidden($name, $value = "", $attrib = "") { - return "\n"; + $id = str_replace(array('[', ']'), "", $name); + return "\n"; } /** @@ -347,7 +348,8 @@ class baseHTML static public function password($name, $value = "", $attrib = "") { if(stripos($attrib, 'autocomplete') === false) $attrib .= " autocomplete='off'"; - return "\n"; + $id = str_replace(array('[', ']'), "", $name); + return "\n"; } /** @@ -364,6 +366,7 @@ class baseHTML static public function textarea($name, $value = "", $attrib = "") { $id = "id='$name'"; + $id = str_replace(array('[', ']'), "", $id); if(strpos($attrib, 'id=') !== false) $id = ''; return "\n"; } @@ -397,8 +400,9 @@ class baseHTML */ static public function date($name, $value = "", $options = '', $attrib = '') { - $html = "
+
+