diff --git a/module/metric/lang/de.php b/module/metric/lang/de.php index 530af404d0..8639809be2 100755 --- a/module/metric/lang/de.php +++ b/module/metric/lang/de.php @@ -77,6 +77,14 @@ $lang->metric->weekFormat = 'Week %s'; $lang->metric->monthDayFormat = '%s-%s'; $lang->metric->yearMonthFormat = '%s-%s'; +$lang->metric->tableHeader = array(); +$lang->metric->tableHeader['project'] = 'Project'; +$lang->metric->tableHeader['product'] = 'Product'; +$lang->metric->tableHeader['execution'] = 'Execution'; +$lang->metric->tableHeader['dept'] = 'Dept'; +$lang->metric->tableHeader['user'] = 'Name'; +$lang->metric->tableHeader['program'] = 'Program'; + $lang->metric->placeholder = new stdclass(); $lang->metric->placeholder->select = "Please select"; $lang->metric->placeholder->project = "All Projects"; diff --git a/module/metric/lang/en.php b/module/metric/lang/en.php index 8235cf85fb..e7fdd63ff6 100755 --- a/module/metric/lang/en.php +++ b/module/metric/lang/en.php @@ -77,6 +77,14 @@ $lang->metric->weekFormat = 'Week %s'; $lang->metric->monthDayFormat = '%s-%s'; $lang->metric->yearMonthFormat = '%s-%s'; +$lang->metric->tableHeader = array(); +$lang->metric->tableHeader['project'] = 'Project'; +$lang->metric->tableHeader['product'] = 'Product'; +$lang->metric->tableHeader['execution'] = 'Execution'; +$lang->metric->tableHeader['dept'] = 'Dept'; +$lang->metric->tableHeader['user'] = 'Name'; +$lang->metric->tableHeader['program'] = 'Program'; + $lang->metric->placeholder = new stdclass(); $lang->metric->placeholder->select = "Please select"; $lang->metric->placeholder->project = "All Projects"; diff --git a/module/metric/lang/fr.php b/module/metric/lang/fr.php index 530af404d0..8639809be2 100755 --- a/module/metric/lang/fr.php +++ b/module/metric/lang/fr.php @@ -77,6 +77,14 @@ $lang->metric->weekFormat = 'Week %s'; $lang->metric->monthDayFormat = '%s-%s'; $lang->metric->yearMonthFormat = '%s-%s'; +$lang->metric->tableHeader = array(); +$lang->metric->tableHeader['project'] = 'Project'; +$lang->metric->tableHeader['product'] = 'Product'; +$lang->metric->tableHeader['execution'] = 'Execution'; +$lang->metric->tableHeader['dept'] = 'Dept'; +$lang->metric->tableHeader['user'] = 'Name'; +$lang->metric->tableHeader['program'] = 'Program'; + $lang->metric->placeholder = new stdclass(); $lang->metric->placeholder->select = "Please select"; $lang->metric->placeholder->project = "All Projects"; diff --git a/module/metric/lang/zh-cn.php b/module/metric/lang/zh-cn.php index 46474b280c..891520e11c 100755 --- a/module/metric/lang/zh-cn.php +++ b/module/metric/lang/zh-cn.php @@ -77,6 +77,14 @@ $lang->metric->weekFormat = '%s周'; $lang->metric->monthDayFormat = '%s-%s'; $lang->metric->yearMonthFormat = '%s-%s'; +$lang->metric->tableHeader = array(); +$lang->metric->tableHeader['project'] = '项目名称'; +$lang->metric->tableHeader['product'] = '产品名称'; +$lang->metric->tableHeader['execution'] = '执行名称'; +$lang->metric->tableHeader['dept'] = '团队名称'; +$lang->metric->tableHeader['user'] = '姓名'; +$lang->metric->tableHeader['program'] = '项目集名称'; + $lang->metric->placeholder = new stdclass(); $lang->metric->placeholder->select = "请选择"; $lang->metric->placeholder->project = "全部项目"; diff --git a/module/metric/model.php b/module/metric/model.php index 0c28656375..2a3466c678 100755 --- a/module/metric/model.php +++ b/module/metric/model.php @@ -49,7 +49,7 @@ class metricModel extends model $scope = current($scopeList); $header = array(); - if(!empty($scopeList)) $header[] = array('name' => 'scope', 'title' => $this->lang->metric->scopeList[$scope] . $this->lang->nameAB, 'width' => 160); + if(!empty($scopeList)) $header[] = array('name' => 'scope', 'title' => $this->lang->metric->tableHeader[$scope], 'width' => 159); if(!empty($dateList)) $header[] = array('name' => 'date', 'title' => $this->lang->metric->date, 'width' => 96); $header[] = array('name' => 'value', 'title' => $this->lang->metric->value, 'width' => 96); if(in_array('date', $fieldList)) $header[] = array('name' => 'calcTime', 'title' => $this->lang->metric->calcTime, 'width' => 128);