diff --git a/module/metric/lang/de.php b/module/metric/lang/de.php index 0872c90ad6..ee980c425b 100755 --- a/module/metric/lang/de.php +++ b/module/metric/lang/de.php @@ -1,15 +1,15 @@ metric->common = "Metric"; -$lang->metric->name = "Name"; +$lang->metric->name = "Metric name"; $lang->metric->stage = "Stage"; -$lang->metric->scope = "Scope"; -$lang->metric->object = "Object"; -$lang->metric->purpose = "Purpose"; +$lang->metric->scope = "Metric scope"; +$lang->metric->object = "Metric object"; +$lang->metric->purpose = "Metric purpose"; $lang->metric->dateType = "Date Type"; -$lang->metric->unit = "Unit"; -$lang->metric->alias = "Abbreviation"; -$lang->metric->code = "Metric Code"; -$lang->metric->desc = "Description"; +$lang->metric->unit = "Metric unit"; +$lang->metric->alias = "Metric alias"; +$lang->metric->code = "Metric code"; +$lang->metric->desc = "Metric desc"; $lang->metric->formula = "Formula"; $lang->metric->when = "Collection Method"; $lang->metric->createdBy = "Created By"; @@ -60,18 +60,6 @@ $lang->metric->day = 'Date'; $lang->metric->nodate = 'Collection date'; $lang->metric->implementType = 'Implement Type'; -$lang->metric->formLabel = new stdclass(); -$lang->metric->formLabel->scope = $lang->metric->common . ' ' . $lang->metric->scope; -$lang->metric->formLabel->object = $lang->metric->common . ' ' . $lang->metric->object; -$lang->metric->formLabel->purpose = $lang->metric->common . ' ' . $lang->metric->purpose; -$lang->metric->formLabel->name = $lang->metric->common . ' ' . $lang->metric->name; -$lang->metric->formLabel->code = $lang->metric->common . ' ' . $lang->metric->code; -$lang->metric->formLabel->dateType = $lang->metric->dateType; -$lang->metric->formLabel->unit = $lang->metric->common . ' ' . $lang->metric->unit; -$lang->metric->formLabel->alias = $lang->metric->common . ' ' . $lang->metric->alias; -$lang->metric->formLabel->desc = $lang->metric->common . ' ' . $lang->metric->desc; -$lang->metric->formLabel->definition = $lang->metric->definition; - $lang->metric->yearFormat = 'Year %s'; $lang->metric->weekFormat = 'Week %s'; $lang->metric->monthDayFormat = '%s-%s'; diff --git a/module/metric/lang/en.php b/module/metric/lang/en.php index 3c5e66f28a..624c24fef1 100755 --- a/module/metric/lang/en.php +++ b/module/metric/lang/en.php @@ -1,15 +1,15 @@ metric->common = "Metric"; -$lang->metric->name = "Name"; +$lang->metric->name = "Metric name"; $lang->metric->stage = "Stage"; -$lang->metric->scope = "Scope"; -$lang->metric->object = "Object"; -$lang->metric->purpose = "Purpose"; +$lang->metric->scope = "Metric scope"; +$lang->metric->object = "Metric object"; +$lang->metric->purpose = "Metric purpose"; $lang->metric->dateType = "Date Type"; -$lang->metric->unit = "Unit"; -$lang->metric->alias = "Abbreviation"; -$lang->metric->code = "Metric Code"; -$lang->metric->desc = "Description"; +$lang->metric->unit = "Metric unit"; +$lang->metric->alias = "Metric alias"; +$lang->metric->code = "Metric code"; +$lang->metric->desc = "Metric desc"; $lang->metric->formula = "Formula"; $lang->metric->when = "Collection Method"; $lang->metric->createdBy = "Created By"; @@ -60,18 +60,6 @@ $lang->metric->day = 'Date'; $lang->metric->nodate = 'Collection date'; $lang->metric->implementType = 'Implement Type'; -$lang->metric->formLabel = new stdclass(); -$lang->metric->formLabel->scope = $lang->metric->common . ' ' . $lang->metric->scope; -$lang->metric->formLabel->object = $lang->metric->common . ' ' . $lang->metric->object; -$lang->metric->formLabel->purpose = $lang->metric->common . ' ' . $lang->metric->purpose; -$lang->metric->formLabel->name = $lang->metric->common . ' ' . $lang->metric->name; -$lang->metric->formLabel->code = $lang->metric->common . ' ' . $lang->metric->code; -$lang->metric->formLabel->dateType = $lang->metric->dateType; -$lang->metric->formLabel->unit = $lang->metric->common . ' ' . $lang->metric->unit; -$lang->metric->formLabel->alias = $lang->metric->common . ' ' . $lang->metric->alias; -$lang->metric->formLabel->desc = $lang->metric->common . ' ' . $lang->metric->desc; -$lang->metric->formLabel->definition = $lang->metric->definition; - $lang->metric->yearFormat = 'Year %s'; $lang->metric->weekFormat = 'Week %s'; $lang->metric->monthDayFormat = '%s-%s'; diff --git a/module/metric/lang/fr.php b/module/metric/lang/fr.php index bd4c53ad17..8db429d781 100755 --- a/module/metric/lang/fr.php +++ b/module/metric/lang/fr.php @@ -1,15 +1,15 @@ metric->common = "Metric"; -$lang->metric->name = "Name"; +$lang->metric->name = "Metric name"; $lang->metric->stage = "Stage"; -$lang->metric->scope = "Scope"; -$lang->metric->object = "Object"; -$lang->metric->purpose = "Purpose"; +$lang->metric->scope = "Metric scope"; +$lang->metric->object = "Metric object"; +$lang->metric->purpose = "Metric purpose"; $lang->metric->dateType = "Date Type"; -$lang->metric->unit = "Unit"; -$lang->metric->alias = "Abbreviation"; -$lang->metric->code = "Metric Code"; -$lang->metric->desc = "Description"; +$lang->metric->unit = "Metric unit"; +$lang->metric->alias = "Metric alias"; +$lang->metric->code = "Metric code"; +$lang->metric->desc = "Metric desc"; $lang->metric->formula = "Formula"; $lang->metric->when = "Collection Method"; $lang->metric->createdBy = "Created By"; @@ -60,18 +60,6 @@ $lang->metric->day = 'Date'; $lang->metric->nodate = 'Collection date'; $lang->metric->implementType = 'Implement Type'; -$lang->metric->formLabel = new stdclass(); -$lang->metric->formLabel->scope = $lang->metric->common . ' ' . $lang->metric->scope; -$lang->metric->formLabel->object = $lang->metric->common . ' ' . $lang->metric->object; -$lang->metric->formLabel->purpose = $lang->metric->common . ' ' . $lang->metric->purpose; -$lang->metric->formLabel->name = $lang->metric->common . ' ' . $lang->metric->name; -$lang->metric->formLabel->code = $lang->metric->common . ' ' . $lang->metric->code; -$lang->metric->formLabel->dateType = $lang->metric->dateType; -$lang->metric->formLabel->unit = $lang->metric->common . ' ' . $lang->metric->unit; -$lang->metric->formLabel->alias = $lang->metric->common . ' ' . $lang->metric->alias; -$lang->metric->formLabel->desc = $lang->metric->common . ' ' . $lang->metric->desc; -$lang->metric->formLabel->definition = $lang->metric->definition; - $lang->metric->yearFormat = 'Year %s'; $lang->metric->weekFormat = 'Week %s'; $lang->metric->monthDayFormat = '%s-%s'; diff --git a/module/metric/lang/zh-cn.php b/module/metric/lang/zh-cn.php index 1fda6eda3c..bc591d6426 100755 --- a/module/metric/lang/zh-cn.php +++ b/module/metric/lang/zh-cn.php @@ -1,16 +1,16 @@ metric->common = "度量项"; $lang->metric->metric = "度量"; -$lang->metric->name = "名称"; +$lang->metric->name = $lang->metric->common . "名称"; $lang->metric->stage = "阶段"; -$lang->metric->scope = "范围"; -$lang->metric->object = "对象"; -$lang->metric->purpose = "目的"; +$lang->metric->scope = $lang->metric->common . "范围"; +$lang->metric->object = $lang->metric->common . "对象"; +$lang->metric->purpose = $lang->metric->common . "目的"; $lang->metric->dateType = "时间属性"; -$lang->metric->unit = "单位"; -$lang->metric->alias = "简称"; -$lang->metric->code = "代号"; -$lang->metric->desc = "描述"; +$lang->metric->unit = $lang->metric->common . "单位"; +$lang->metric->alias = $lang->metric->common . "简称"; +$lang->metric->code = $lang->metric->common . "代号"; +$lang->metric->desc = $lang->metric->common . "描述"; $lang->metric->formula = "计算规则"; $lang->metric->when = "收集方式"; $lang->metric->createdBy = "创建者"; @@ -61,18 +61,6 @@ $lang->metric->day = '日期'; $lang->metric->nodate = '采集日期'; $lang->metric->implementType = '实现方式'; -$lang->metric->formLabel = new stdclass(); -$lang->metric->formLabel->scope = $lang->metric->metric . $lang->metric->scope; -$lang->metric->formLabel->object = $lang->metric->metric . $lang->metric->object; -$lang->metric->formLabel->purpose = $lang->metric->metric . $lang->metric->purpose; -$lang->metric->formLabel->name = $lang->metric->common . $lang->metric->name; -$lang->metric->formLabel->code = $lang->metric->common . $lang->metric->code; -$lang->metric->formLabel->dateType = $lang->metric->dateType; -$lang->metric->formLabel->unit = $lang->metric->metric . $lang->metric->unit; -$lang->metric->formLabel->alias = $lang->metric->common . $lang->metric->alias; -$lang->metric->formLabel->desc = $lang->metric->common . $lang->metric->desc; -$lang->metric->formLabel->definition = $lang->metric->definition; - $lang->metric->yearFormat = '%s年'; $lang->metric->weekFormat = '%s周'; $lang->metric->monthDayFormat = '%s-%s'; diff --git a/module/metric/lang/zh-tw.php b/module/metric/lang/zh-tw.php index b2c023835e..5f301e2ade 100755 --- a/module/metric/lang/zh-tw.php +++ b/module/metric/lang/zh-tw.php @@ -27,18 +27,6 @@ $lang->metric->definition = "計算規則"; $lang->metric->customUnit = "自定義"; $lang->metric->implementType = '实现方式'; -$lang->metric->formLabel = new stdclass(); -$lang->metric->formLabel->scope = $lang->metric->common . $lang->metric->scope; -$lang->metric->formLabel->object = $lang->metric->common . $lang->metric->object; -$lang->metric->formLabel->purpose = $lang->metric->common . $lang->metric->purpose; -$lang->metric->formLabel->name = $lang->metric->common . $lang->metric->name; -$lang->metric->formLabel->code = $lang->metric->common . $lang->metric->code; -$lang->metric->formLabel->dateType = $lang->metric->dateType; -$lang->metric->formLabel->unit = $lang->metric->common . $lang->metric->unit; -$lang->metric->formLabel->alias = $lang->metric->common . $lang->metric->alias; -$lang->metric->formLabel->desc = $lang->metric->common . $lang->metric->desc; -$lang->metric->formLabel->definition = $lang->metric->definition; - $lang->metric->yearFormat = '%s年'; $lang->metric->weekFormat = '%s周'; $lang->metric->monthDayFormat = '%s-%s'; diff --git a/module/metric/ui/create.html.php b/module/metric/ui/create.html.php index 177f7b3933..3afb44058f 100644 --- a/module/metric/ui/create.html.php +++ b/module/metric/ui/create.html.php @@ -70,7 +70,7 @@ formPanel formGroup ( set::width('1/2'), - set::label($lang->metric->formLabel->scope), + set::label($lang->metric->scope), set::name('scope'), set::items($lang->metric->scopeList), set::value($scope), @@ -79,7 +79,7 @@ formPanel formGroup ( set::width('1/2'), - set::label($lang->metric->formLabel->object), + set::label($lang->metric->object), set::name('object'), set::items($lang->metric->objectList), set::value('program'), @@ -91,7 +91,7 @@ formPanel formGroup ( set::width('1/2'), - set::label($lang->metric->formLabel->purpose), + set::label($lang->metric->purpose), set::name('purpose'), set::items($lang->metric->purposeList), set::value('scale'), @@ -99,7 +99,7 @@ formPanel ), formGroup ( - set::label($lang->metric->formLabel->dateType), + set::label($lang->metric->dateType), set::name('dateType'), set::items($lang->metric->dateTypeList), set::value($period), @@ -111,14 +111,14 @@ formPanel ( formGroup ( - set::label($lang->metric->formLabel->name), + set::label($lang->metric->name), set::name('name'), set::width('1/2'), set::required(true) ), formGroup ( - set::label($lang->metric->formLabel->alias), + set::label($lang->metric->alias), set::name('alias'), set::required(false), set::width('1/2'), @@ -129,7 +129,7 @@ formPanel ( formGroup ( - set::label($lang->metric->formLabel->code), + set::label($lang->metric->code), set::name('code'), set::width('1/2'), set::required(true) @@ -138,7 +138,7 @@ formPanel ( set::id('unitBox'), set::width('1/2'), - set::label($lang->metric->formLabel->unit), + set::label($lang->metric->unit), inputGroup ( div @@ -166,7 +166,7 @@ formPanel set::id('addUnitBox'), setClass('hidden'), set::width('1/2'), - set::label($lang->metric->formLabel->unit), + set::label($lang->metric->unit), inputGroup ( div @@ -189,14 +189,14 @@ formPanel on::change('[name=customUnit]', 'addUnit'), formGroup ( - set::label($lang->metric->formLabel->desc), + set::label($lang->metric->desc), set::control(array('type' => 'textarea', 'rows' => 3)), set::name('desc'), set::placeholder($lang->metric->descTip) ), formGroup ( - set::label($lang->metric->formLabel->definition), + set::label($lang->metric->definition), set::control(array('type' => 'textarea', 'rows' => 3)), set::name('definition'), set::placeholder($lang->metric->definitionTip) diff --git a/module/metric/ui/edit.html.php b/module/metric/ui/edit.html.php index 7259f7ae41..85c7a5b122 100644 --- a/module/metric/ui/edit.html.php +++ b/module/metric/ui/edit.html.php @@ -65,7 +65,7 @@ formPanel formGroup ( set::width('1/2'), - set::label($lang->metric->formLabel->scope), + set::label($lang->metric->scope), set::name('scope'), set::items($lang->metric->scopeList), set::value($metric->scope), @@ -75,7 +75,7 @@ formPanel formGroup ( set::width('1/2'), - set::label($lang->metric->formLabel->object), + set::label($lang->metric->object), set::name('object'), set::items($lang->metric->objectList), set::value($metric->object), @@ -88,7 +88,7 @@ formPanel formGroup ( set::width('1/2'), - set::label($lang->metric->formLabel->purpose), + set::label($lang->metric->purpose), set::name('purpose'), set::items($lang->metric->purposeList), set::value($metric->purpose), @@ -97,7 +97,7 @@ formPanel ), formGroup ( - set::label($lang->metric->formLabel->dateType), + set::label($lang->metric->dateType), set::name('dateType'), set::items($lang->metric->dateTypeList), set::value($metric->dateType), @@ -110,7 +110,7 @@ formPanel ( formGroup ( - set::label($lang->metric->formLabel->name), + set::label($lang->metric->name), set::name('name'), set::value($metric->name), set::width('1/2'), @@ -118,7 +118,7 @@ formPanel ), formGroup ( - set::label($lang->metric->formLabel->alias), + set::label($lang->metric->alias), set::name('alias'), set::value($metric->alias), set::required(false), @@ -130,7 +130,7 @@ formPanel ( formGroup ( - set::label($lang->metric->formLabel->code), + set::label($lang->metric->code), set::name('code'), set::width('1/2'), set::value($metric->code), @@ -142,7 +142,7 @@ formPanel set::id('unitBox'), setClass($isCustomUnit ? 'hidden' : ''), set::width('1/2'), - set::label($lang->metric->formLabel->unit), + set::label($lang->metric->unit), inputGroup ( div @@ -174,7 +174,7 @@ formPanel set::id('addUnitBox'), setClass($isCustomUnit ? '' : 'hidden'), set::width('1/2'), - set::label($lang->metric->formLabel->unit), + set::label($lang->metric->unit), inputGroup ( div @@ -198,7 +198,7 @@ formPanel on::change('[name=customUnit]', 'addUnit'), formGroup ( - set::label($lang->metric->formLabel->desc), + set::label($lang->metric->desc), set::control(array('type' => 'textarea', 'rows' => 3)), set::name('desc'), set::value($metric->desc), @@ -206,7 +206,7 @@ formPanel ), formGroup ( - set::label($lang->metric->formLabel->definition), + set::label($lang->metric->definition), set::control(array('type' => 'textarea', 'rows' => 3)), set::name('definition'), set::value($metric->definition),