diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 4f4167250f..ba0959a79f 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -50,8 +50,8 @@ idAB);?> priAB);?> - task->program);?> - task->project);?> + task->project);?> + task->execution);?> task->name);?> openedByAB);?> diff --git a/module/project/config.php b/module/project/config.php index 9d7752637b..8b86959fda 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -44,7 +44,7 @@ $config->project->search['fields']['desc'] = $lang->task->desc; $config->project->search['fields']['assignedTo'] = $lang->task->assignedTo; $config->project->search['fields']['pri'] = $lang->task->pri; -$config->project->search['fields']['project'] = $lang->task->project; +$config->project->search['fields']['project'] = $lang->task->execution; $config->project->search['fields']['module'] = $lang->task->module; $config->project->search['fields']['estimate'] = $lang->task->estimate; $config->project->search['fields']['left'] = $lang->task->left; diff --git a/module/task/lang/de.php b/module/task/lang/de.php index 7490bf1e4c..4a711897c1 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -55,8 +55,8 @@ $lang->task->allModule = 'All Module'; $lang->task->common = 'Aufgabe'; $lang->task->id = 'ID'; -$lang->task->program = 'Program'; -$lang->task->project = $lang->executionCommon; +$lang->task->project = 'Project'; +$lang->task->execution = $lang->executionCommon; $lang->task->module = 'Modul'; $lang->task->moduleAB = 'Modul'; $lang->task->story = 'Story'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index b773a0f57c..179ca28f18 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -55,8 +55,8 @@ $lang->task->allModule = 'All Module'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; -$lang->task->program = 'Program'; -$lang->task->project = $lang->executionCommon; +$lang->task->project = 'Project'; +$lang->task->execution = $lang->executionCommon; $lang->task->module = 'Module'; $lang->task->moduleAB = 'Module'; $lang->task->story = 'Story'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index a5feaf36c2..84ce19f25a 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -55,8 +55,8 @@ $lang->task->allModule = 'Tous Modules'; $lang->task->common = 'Tâche'; $lang->task->id = 'ID'; -$lang->task->program = 'Program'; -$lang->task->project = $lang->executionCommon; +$lang->task->project = 'Project'; +$lang->task->execution = $lang->executionCommon; $lang->task->module = 'Module'; $lang->task->moduleAB = 'Module'; $lang->task->story = 'Story'; diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php index dab3256b43..133f5ef84e 100644 --- a/module/task/lang/vi.php +++ b/module/task/lang/vi.php @@ -55,8 +55,8 @@ $lang->task->allModule = 'Tất cả Module'; $lang->task->common = 'Nhiệm vụ'; $lang->task->id = 'ID'; -$lang->task->program = 'Program'; -$lang->task->project = $lang->executionCommon; +$lang->task->project = 'project'; +$lang->task->execution = $lang->executionCommon; $lang->task->module = 'Module'; $lang->task->moduleAB = 'Module'; $lang->task->story = 'Câu chuyện'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index cc9bd0a24f..fb4e1f16cb 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -55,8 +55,8 @@ $lang->task->allModule = '所有模块'; $lang->task->common = '任务'; $lang->task->id = '编号'; -$lang->task->program = '所属项目'; -$lang->task->project = '所属' . $lang->executionCommon; +$lang->task->project = '所属项目'; +$lang->task->execution = '所属' . $lang->executionCommon; $lang->task->module = '所属模块'; $lang->task->moduleAB = '模块'; $lang->task->story = "相关{$lang->productSRCommon}"; diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 2777892c9b..0bab4f314c 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -21,7 +21,7 @@ js::set('dittoNotice', $dittoNotice);

task->common . $lang->colon . $lang->task->batchEdit;?> - icons['project']) . ' ' . $lang->task->project . $lang->colon . ' ' . $projectName;?> + icons['project']) . ' ' . $lang->task->execution . $lang->colon . ' ' . $projectName;?>

diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index e3279e70da..481db3ab8b 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -33,7 +33,7 @@
- + diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index feece1cb83..def5e7a9a4 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -90,7 +90,7 @@
task->project;?>task->execution;?> id, "class='form-control chosen' onchange='loadAll(this.value)' required");?>
parent <= 0):?> - + diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 77cc42e58a..504d2db593 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -195,7 +195,7 @@
task->project;?>task->execution;?> project, 'class="form-control chosen" onchange="loadAll(this.value)"');?>
- + diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php index 3d8415f877..cf5a259a56 100644 --- a/module/user/view/task.html.php +++ b/module/user/view/task.html.php @@ -42,7 +42,7 @@ - +
task->project;?>task->execution;?> project", $project->name)) echo $project->name;?>
idAB;?> priAB;?>task->project;?>task->execution;?> task->name;?> task->estimateAB;?> task->consumedAB;?>