diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index c395805005..f70d948559 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -295,12 +295,12 @@ $lang->execution->doneExecutions = 'Finished'; $lang->execution->selectDept = 'Select Department'; $lang->execution->selectDeptTitle = 'Select User'; $lang->execution->copyTeam = 'Copy Team'; -$lang->execution->copyFromTeam = "Copy from {$lang->executionCommon} Team: %s"; -$lang->execution->noMatched = "No $lang->executionCommon including '%s'can be found."; -$lang->execution->copyTitle = "Choose a {$lang->executionCommon} to copy."; -$lang->execution->copyTeamTitle = "Choose a {$lang->projectCommon} or {$lang->executionCommon} Team to copy."; -$lang->execution->copyNoExecution = "No {$lang->executionCommon} can be copied."; -$lang->execution->copyFromExecution = "Copy from {$lang->executionCommon} %s"; +$lang->execution->copyFromTeam = "Copy from {$lang->execution->common} Team: %s"; +$lang->execution->noMatched = "No {$lang->execution->common} including '%s'can be found."; +$lang->execution->copyTitle = "Choose a {$lang->execution->common} to copy."; +$lang->execution->copyTeamTitle = "Choose a {$lang->projectCommon} or {$lang->execution->common} Team to copy."; +$lang->execution->copyNoExecution = "No {$lang->execution->common} can be copied."; +$lang->execution->copyFromExecution = "Copy from {$lang->execution->common} %s"; $lang->execution->cancelCopy = 'Cancel Copy'; $lang->execution->byPeriod = 'By Time'; $lang->execution->byUser = 'By User'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index d3b5f6dea1..700ee01ad7 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -295,12 +295,12 @@ $lang->execution->doneExecutions = '已结束'; $lang->execution->selectDept = '选择部门'; $lang->execution->selectDeptTitle = '选择一个部门的成员'; $lang->execution->copyTeam = '复制团队'; -$lang->execution->copyFromTeam = "复制自{$lang->executionCommon}团队: %s"; -$lang->execution->noMatched = "找不到包含'%s'的$lang->executionCommon"; -$lang->execution->copyTitle = "请选择一个{$lang->executionCommon}来复制"; -$lang->execution->copyTeamTitle = "选择一个{$lang->projectCommon}或{$lang->executionCommon}团队来复制"; -$lang->execution->copyNoExecution = "没有可用的{$lang->executionCommon}来复制"; -$lang->execution->copyFromExecution = "复制自{$lang->executionCommon} %s"; +$lang->execution->copyFromTeam = "复制自{$lang->execution->common}团队: %s"; +$lang->execution->noMatched = "找不到包含'%s'的{$lang->execution->common}"; +$lang->execution->copyTitle = "请选择一个{$lang->execution->common}来复制"; +$lang->execution->copyTeamTitle = "选择一个{$lang->projectCommon}或{$lang->execution->common}团队来复制"; +$lang->execution->copyNoExecution = "没有可用的{$lang->execution->common}来复制"; +$lang->execution->copyFromExecution = "复制自{$lang->execution->common} %s"; $lang->execution->cancelCopy = '取消复制'; $lang->execution->byPeriod = '按时间段'; $lang->execution->byUser = '按用户'; diff --git a/module/execution/view/managemembers.html.php b/module/execution/view/managemembers.html.php index ed523ff266..2982c223de 100644 --- a/module/execution/view/managemembers.html.php +++ b/module/execution/view/managemembers.html.php @@ -26,7 +26,8 @@ execution->selectDeptTitle}'");?> execution->copyTeam?> - execution->copyTeamTitle}'");?> + systemMode == 'new' ? $lang->execution->copyTeamTitle : $lang->execution->copyTitle;?> + diff --git a/module/personnel/control.php b/module/personnel/control.php index 2b33b8cf42..6f1f33c8a8 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -190,10 +190,11 @@ class personnel extends control $copyUsers = empty($copyID) ? array() : $this->personnel->getWhitelistAccount($copyID, $copyObjectType); $appendUsers = array_unique($deptUsers + $copyUsers); - $objectName = $this->lang->projectCommon . $this->lang->execution->or . $this->lang->execution->common; - if($objectType == 'program') $objectName = $this->lang->program->common; - if($objectType == 'product') $objectName = $this->lang->productCommon; - if($objectType == 'project') $objectName = $this->lang->projectCommon; + $objectName = $this->lang->execution->common; + if($this->config->systemMode == 'new') $objectName = $this->lang->projectCommon . $this->lang->execution->or . $objectName; + if($objectType == 'program') $objectName = $this->lang->program->common; + if($objectType == 'product') $objectName = $this->lang->productCommon; + if($objectType == 'project') $objectName = $this->lang->projectCommon; $this->lang->personnel->selectObjectTips = sprintf($this->lang->personnel->selectObjectTips, $objectName); $this->view->title = $this->lang->personnel->addWhitelist;