diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index d9c7e13fdf..83c5cd6e31 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -51,7 +51,7 @@ $lang->execution->canceledBy = 'CanceledBy'; $lang->execution->canceledDate = 'CanceledDate'; $lang->execution->begin = 'Planned Begin'; $lang->execution->end = 'Planned End'; -$lang->execution->dateRange = 'Duration'; +$lang->execution->dateRange = 'Plan Duration'; $lang->execution->realBeganAB = 'Actual Begin'; $lang->execution->realEndAB = 'Actual End'; $lang->execution->realBegan = 'Actual Begin'; diff --git a/module/program/control.php b/module/program/control.php index e265a22462..911930d377 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -429,7 +429,7 @@ class program extends control if($productCount) return print(js::alert($this->lang->program->hasProduct)); $program = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch(); - if($confirm == 'no') return print(js::confirm($this->lang->program->confirmDelete, $this->createLink('program', 'delete', "programID=$programID&confirm=yes"))); + if($confirm == 'no') return print(js::confirm(sprintf($this->lang->program->confirmDelete, $program->name), $this->createLink('program', 'delete', "programID=$programID&confirm=yes"))); $this->dao->update(TABLE_PROGRAM)->set('deleted')->eq(1)->where('id')->eq($programID)->exec(); $this->loadModel('action')->create('program', $programID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED); @@ -543,7 +543,7 @@ class program extends control { if($confirm == 'no') { - return print(js::confirm($this->lang->program->confirmDelete, $this->inlink('unlinkStakeholder', "stakeholderID=$stakeholderID&programID=$programID&confirm=yes"))); + return print(js::confirm($this->lang->program->unlinkStakeholder, $this->inlink('unlinkStakeholder', "stakeholderID=$stakeholderID&programID=$programID&confirm=yes"))); } else { diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 81ff6f9c17..6727645a63 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -106,7 +106,8 @@ $lang->program->endLetterChild = "Child latest end: %s, parent end date > $lang->program->closeErrorMessage = 'There are subprograms or projects that are not closed'; $lang->program->hasChildren = 'The program has a child program or the project exists and can not be deleted.'; $lang->program->hasProduct = 'The program has products exist and can not be deleted.'; -$lang->program->confirmDelete = "Do you want to delete it?"; +$lang->program->confirmDelete = 'Do you want to delete \"%s\" program?'; +$lang->program->unlinkStakeholder = 'Do you want to remove the Stakeholder?'; $lang->program->readjustTime = 'Change the program begin&end date.'; $lang->program->accessDenied = 'You have no access to the program.'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 3478e2aebc..1753911875 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -106,7 +106,8 @@ $lang->program->endLetterChild = "子项目的最大完成日期:%s,父 $lang->program->closeErrorMessage = '存在子项目集或项目为未关闭状态'; $lang->program->hasChildren = '该项目集有子项目集或项目存在,不能删除。'; $lang->program->hasProduct = '该项目集有产品存在,不能删除。'; -$lang->program->confirmDelete = "您确定要删除吗?"; +$lang->program->confirmDelete = '您确定要删除\"%s\"项目集吗?'; +$lang->program->unlinkStakeholder = '你确定要移除干系人吗'; $lang->program->readjustTime = '重新调整项目集起止时间'; $lang->program->accessDenied = '你无权访问该项目集'; $lang->program->beyondParentBudget = '已超出所属项目集的剩余预算'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 30c8011570..c4338b3430 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -119,7 +119,7 @@ $lang->project->estimate = 'Estimates'; $lang->project->consume = 'Cost'; $lang->project->surplus = 'Left'; $lang->project->progress = 'Progress'; -$lang->project->dateRange = 'Duration'; +$lang->project->dateRange = 'Plan Duration'; $lang->project->to = ' to '; $lang->project->realBeganAB = 'Actual Begin'; $lang->project->realEndAB = 'Actual End'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 0913b1d071..73f13572d7 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -119,7 +119,7 @@ $lang->project->estimate = '预计'; $lang->project->consume = '消耗'; $lang->project->surplus = '剩余'; $lang->project->progress = '进度'; -$lang->project->dateRange = '起止日期'; +$lang->project->dateRange = '计划起止日期'; $lang->project->to = '至'; $lang->project->realBeganAB = '实际开始'; $lang->project->realEndAB = '实际完成'; diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index f961aa09f3..dd6aa0a225 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -41,7 +41,7 @@
- + app->tab == 'product' ? 'disabled' : '';?> diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 127b374d5f..25b9177f30 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -37,7 +37,7 @@
project->parent;?>project->parent;?>
model != 'kanban'):?> - + diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php index cc9cbc8f2a..1a214f23ff 100644 --- a/module/project/view/manageproducts.html.php +++ b/module/project/view/manageproducts.html.php @@ -71,7 +71,6 @@
-
project->model;?>project->model;?> project->modelList, $model, "class='form-control chosen' required $disableModel");?>