diff --git a/module/project/config.php b/module/project/config.php index 9fb9286c56..5330fe9321 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -138,7 +138,7 @@ $config->project->search['fields']['code'] = $lang->project->code; $config->project->search['fields']['id'] = $lang->project->id; $config->project->search['fields']['model'] = $lang->project->model; $config->project->search['fields']['parent'] = $lang->project->parent; -$config->project->search['fields']['status'] = $lang->project->projectStatus; +$config->project->search['fields']['status'] = $lang->project->status; $config->project->search['fields']['desc'] = $lang->project->desc; $config->project->search['fields']['PM'] = $lang->project->PM; $config->project->search['fields']['openedDate'] = $lang->project->openedDate; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 8f30c43aac..c44e458fe8 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -226,6 +226,7 @@ $lang->project->currencySymbol['NZD'] = 'NZ$'; $lang->project->currencySymbol['THB'] = '฿'; $lang->project->currencySymbol['SGD'] = 'S$'; +$lang->project->modelList[''] = ''; $lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['waterfall'] = "CMMI"; $lang->project->modelList['kanban'] = "Kanban"; @@ -256,6 +257,7 @@ $lang->project->kanbanSubAclList['program'] = 'Open in the program (all upper-le $lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)'; $lang->project->authList['reset'] = 'Reset (project privilege only)'; +$lang->project->statusList[''] = ''; $lang->project->statusList['wait'] = 'Waiting'; $lang->project->statusList['doing'] = 'Doing'; $lang->project->statusList['suspended'] = 'Suspended'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index b60f1e6366..4ef428fc61 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -79,7 +79,6 @@ $lang->project->begin = '计划开始'; $lang->project->end = '计划完成'; $lang->project->status = '状态'; $lang->project->subStatus = '子状态'; -$lang->project->projectStatus = '项目状态'; $lang->project->type = '项目类型'; $lang->project->lifetime = '项目周期'; $lang->project->attribute = '阶段类型'; @@ -162,7 +161,6 @@ $lang->project->branch = '所属分支'; $lang->project->plan = '所属计划'; $lang->project->createKanban = '添加看板'; $lang->project->kanban = '看板'; -$lang->project->search = '搜索'; /* Project Kanban. */ $lang->project->typeList = array(); diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php index 052a85fe84..c459a4c95f 100644 --- a/module/project/view/browsebylist.html.php +++ b/module/project/view/browsebylist.html.php @@ -40,7 +40,7 @@ $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?> - project->search;?> + search->common;?>