diff --git a/module/custom/control.php b/module/custom/control.php index 416bcd8da1..9c8b9532fa 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -364,16 +364,6 @@ class custom extends control $data = fixer::input('post')->get(); /* Judgment of required items. */ - if(($unit != $_POST['hourPoint']) and empty($_POST['scaleFactor'])) - { - dao::$errors['scaleFactor'] = sprintf($this->lang->error->notempty, $this->lang->custom->convertRelations); - $this->send(array('result' => 'fail', 'message' => dao::getError())); - } - elseif(($unit != $_POST['hourPoint']) and !is_numeric($_POST['scaleFactor'])) - { - dao::$errors['scaleFactor'] = sprintf($this->lang->error->float, $this->lang->custom->convertRelations); - $this->send(array('result' => 'fail', 'message' => dao::getError())); - } $this->setting->setItem('system.custom.hourPoint', $data->hourPoint); $this->setting->setItem('system.custom.scaleFactor', $data->scaleFactor); diff --git a/module/custom/js/estimate.js b/module/custom/js/estimate.js index 445f72e2e1..90c9f7f2f4 100644 --- a/module/custom/js/estimate.js +++ b/module/custom/js/estimate.js @@ -4,18 +4,23 @@ $(document).ready(function() $('input[name="hourPoint"]').change(function() { /* Show or hide conversion relation fields. */ - if($(this).val() == unit) + if($(this).val() != unit) { - $('#convertRelations').addClass('hidden'); - } - else - { - $('#convertRelations').removeClass('hidden'); + if($(this).val() == 0) var hourPoint = workingHours; + if($(this).val() == 1) var hourPoint = storyPoint; + if($(this).val() == 2) var hourPoint = functionPoint; + + convertRelationTitle = convertRelationTitle.replace('%s', hourPoint); + convertRelationTips = convertRelationTips.replace(/%s/g, hourPoint); + $('#factor + span').text(hourPoint); + + $('#title').text(convertRelationTitle); + $('#tips').text(convertRelationTips); + $('#convertRelations').modal({show: true}); } if($(this).val() == 0) { - $('#scaleFactor + span').text(workingHours); $('#efficiency + span').text(workingHours); $('#efficiency').val("1"); $('.efficiency').addClass('hidden'); @@ -27,15 +32,37 @@ $(document).ready(function() $('.efficiency').removeClass('hidden'); if($(this).val() == 1) { - $('#scaleFactor + span').text(storyPoint); $('#efficiency + span').text(efficiency + storyPoint); } if($(this).val() == 2) { - $('#scaleFactor + span').text(functionPoint); $('#efficiency + span').text(efficiency + functionPoint); } } }); }); + +/** + * Set scale factor. + * + * @access public + * @return void + */ +function setScaleFactor() +{ + var scaleFactor = $('#factor').val(); + if(!scaleFactor) + { + alert(notempty); + } + else if(isNaN(scaleFactor)) + { + alert(notNumber); + } + else + { + $('#scaleFactor').val(scaleFactor); + $('#convertRelations').modal('hide'); + } +} diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 447b9286e5..5649baf313 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -1,55 +1,56 @@ custom->common = 'Custom'; -$lang->custom->index = 'Home'; -$lang->custom->set = 'Customize'; -$lang->custom->restore = 'Reset to Default'; -$lang->custom->key = 'Key'; -$lang->custom->value = 'Value'; -$lang->custom->flow = 'Concept'; -$lang->custom->working = 'WorkStyle'; -$lang->custom->select = 'Select Concept'; -$lang->custom->branch = 'Multi Branch'; -$lang->custom->owner = 'Owner'; -$lang->custom->module = 'Module'; -$lang->custom->section = 'Section'; -$lang->custom->lang = 'Language'; -$lang->custom->setPublic = 'Set Public'; -$lang->custom->required = 'Required'; -$lang->custom->score = 'Score'; -$lang->custom->timezone = 'Timezone'; -$lang->custom->scoreReset = 'Reset Score'; -$lang->custom->scoreTitle = 'Point Feature'; -$lang->custom->project = $lang->sprintCommon; -$lang->custom->product = $lang->productCommon; -$lang->custom->estimate = 'Estimated configuration'; -$lang->custom->estimateConfig = 'Estimated configuration'; -$lang->custom->estimateUnit = 'Estimating Unit'; -$lang->custom->estimateEfficiency = 'Productivity'; -$lang->custom->estimateCost = 'Unit Labour Cost'; -$lang->custom->estimateHours = 'Daily Working Hours'; -$lang->custom->estimateDays = 'Working Days Per Week'; -$lang->custom->convertRelations = 'Convert Relations'; -$lang->custom->region = 'Interval'; -$lang->custom->tips = 'Tips'; -$lang->custom->setTips = 'Set Tips'; -$lang->custom->isRange = 'Is Target Control'; -$lang->custom->concept = "Concept"; -$lang->custom->URStory = "User requirements"; -$lang->custom->SRStory = "Software requirements"; -$lang->custom->epic = "Epic"; -$lang->custom->scrumStory = "Story"; -$lang->custom->waterfallCommon = "Waterfall"; -$lang->custom->buildin = "Buildin"; -$lang->custom->isDefault = 'Is Default'; -$lang->custom->editStoryConcept = "Edit Story Concept"; -$lang->custom->setStoryConcept = "Set Story Concept"; -$lang->custom->setDefaultConcept = "Set Default Concept"; -$lang->custom->browseStoryConcept = "List of story concepts"; -$lang->custom->deleteStoryConcept = "Delete story Concept"; -$lang->custom->configureScrum = "Scrum Model Custom"; -$lang->custom->URConcept = "UR Concept"; -$lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = " One"; +$lang->custom->common = 'Custom'; +$lang->custom->index = 'Home'; +$lang->custom->set = 'Customize'; +$lang->custom->restore = 'Reset to Default'; +$lang->custom->key = 'Key'; +$lang->custom->value = 'Value'; +$lang->custom->flow = 'Concept'; +$lang->custom->working = 'WorkStyle'; +$lang->custom->select = 'Select Concept'; +$lang->custom->branch = 'Multi Branch'; +$lang->custom->owner = 'Owner'; +$lang->custom->module = 'Module'; +$lang->custom->section = 'Section'; +$lang->custom->lang = 'Language'; +$lang->custom->setPublic = 'Set Public'; +$lang->custom->required = 'Required'; +$lang->custom->score = 'Score'; +$lang->custom->timezone = 'Timezone'; +$lang->custom->scoreReset = 'Reset Score'; +$lang->custom->scoreTitle = 'Point Feature'; +$lang->custom->project = $lang->sprintCommon; +$lang->custom->product = $lang->productCommon; +$lang->custom->estimate = 'Estimated configuration'; +$lang->custom->estimateConfig = 'Estimated configuration'; +$lang->custom->estimateUnit = 'Estimating Unit'; +$lang->custom->estimateEfficiency = 'Productivity'; +$lang->custom->estimateCost = 'Unit Labour Cost'; +$lang->custom->estimateHours = 'Daily Working Hours'; +$lang->custom->estimateDays = 'Working Days Per Week'; +$lang->custom->scaleFactor = 'Conversion factor'; +$lang->custom->region = 'Interval'; +$lang->custom->tips = 'Tips'; +$lang->custom->setTips = 'Set Tips'; +$lang->custom->isRange = 'Is Target Control'; +$lang->custom->concept = "Concept"; +$lang->custom->URStory = "User requirements"; +$lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; +$lang->custom->waterfallCommon = "Waterfall"; +$lang->custom->buildin = "Buildin"; +$lang->custom->isDefault = 'Is Default'; +$lang->custom->editStoryConcept = "Edit Story Concept"; +$lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; +$lang->custom->browseStoryConcept = "List of story concepts"; +$lang->custom->deleteStoryConcept = "Delete story Concept"; +$lang->custom->configureScrum = "Scrum Model Custom"; +$lang->custom->URConcept = "UR Concept"; +$lang->custom->SRConcept = "SR Concept"; +$lang->custom->oneUnit = "One {$lang->hourCommon}"; +$lang->custom->convertRelationTitle = "Conversion factor of {$lang->hourCommon} converted to %s"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -67,10 +68,11 @@ $lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)'; $lang->custom->tipRangeList[0] = 'No'; $lang->custom->tipRangeList[1] = 'Yes'; -$lang->custom->regionMustNumber = 'The interval must be a number!'; -$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; -$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; -$lang->custom->defaultNotEmpty = 'The default currency can not be empty'; +$lang->custom->regionMustNumber = 'The interval must be a number!'; +$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; +$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; +$lang->custom->defaultNotEmpty = 'The default currency can not be empty'; +$lang->custom->convertRelationTips = "After {$lang->hourCommon} is converted to %s, historical data will be uniformly converted to %s"; $lang->custom->numberError = 'The interval must be greater than zero!'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 6e99070d28..4b05c2278f 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -1,55 +1,56 @@ custom->common = 'Custom'; -$lang->custom->index = 'Home'; -$lang->custom->set = 'Customize'; -$lang->custom->restore = 'Reset'; -$lang->custom->key = 'Key'; -$lang->custom->value = 'Value'; -$lang->custom->flow = 'Concept'; -$lang->custom->working = 'Mode'; -$lang->custom->select = 'Select Concept'; -$lang->custom->branch = 'Multi-Branch'; -$lang->custom->owner = 'Owner'; -$lang->custom->module = 'Module'; -$lang->custom->section = 'Section'; -$lang->custom->lang = 'Language'; -$lang->custom->setPublic = 'Set Public'; -$lang->custom->required = 'Required Field'; -$lang->custom->score = 'Point'; -$lang->custom->timezone = 'Timezone'; -$lang->custom->scoreReset = 'Reset Points'; -$lang->custom->scoreTitle = 'Point Feature'; -$lang->custom->project = $lang->sprintCommon; -$lang->custom->product = $lang->productCommon; -$lang->custom->estimate = 'Estimated configuration'; -$lang->custom->estimateConfig = 'Estimated configuration'; -$lang->custom->estimateUnit = 'Estimating Unit'; -$lang->custom->estimateEfficiency = 'Productivity'; -$lang->custom->estimateCost = 'Unit Labour Cost'; -$lang->custom->estimateHours = 'Daily Working Hours'; -$lang->custom->estimateDays = 'Working Days Per Week'; -$lang->custom->convertRelations = 'Convert Relations'; -$lang->custom->region = 'Interval'; -$lang->custom->tips = 'Tips'; -$lang->custom->setTips = 'Set Tips'; -$lang->custom->isRange = 'Is Target Control'; -$lang->custom->concept = "Concept"; -$lang->custom->URStory = "User requirements"; -$lang->custom->SRStory = "Software requirements"; -$lang->custom->epic = "Epic"; -$lang->custom->scrumStory = "Story"; -$lang->custom->waterfallCommon = "Waterfall"; -$lang->custom->buildin = "Buildin"; -$lang->custom->isDefault = 'Is Default'; -$lang->custom->editStoryConcept = "Edit Story Concept"; -$lang->custom->setStoryConcept = "Set Story Concept"; -$lang->custom->setDefaultConcept = "Set Default Concept"; -$lang->custom->browseStoryConcept = "List of story concepts"; -$lang->custom->deleteStoryConcept = "Delete story Concept"; -$lang->custom->configureScrum = "Scrum Model Custom"; -$lang->custom->URConcept = "UR Concept"; -$lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = " One"; +$lang->custom->common = 'Custom'; +$lang->custom->index = 'Home'; +$lang->custom->set = 'Customize'; +$lang->custom->restore = 'Reset'; +$lang->custom->key = 'Key'; +$lang->custom->value = 'Value'; +$lang->custom->flow = 'Concept'; +$lang->custom->working = 'Mode'; +$lang->custom->select = 'Select Concept'; +$lang->custom->branch = 'Multi-Branch'; +$lang->custom->owner = 'Owner'; +$lang->custom->module = 'Module'; +$lang->custom->section = 'Section'; +$lang->custom->lang = 'Language'; +$lang->custom->setPublic = 'Set Public'; +$lang->custom->required = 'Required Field'; +$lang->custom->score = 'Point'; +$lang->custom->timezone = 'Timezone'; +$lang->custom->scoreReset = 'Reset Points'; +$lang->custom->scoreTitle = 'Point Feature'; +$lang->custom->project = $lang->sprintCommon; +$lang->custom->product = $lang->productCommon; +$lang->custom->estimate = 'Estimated configuration'; +$lang->custom->estimateConfig = 'Estimated configuration'; +$lang->custom->estimateUnit = 'Estimating Unit'; +$lang->custom->estimateEfficiency = 'Productivity'; +$lang->custom->estimateCost = 'Unit Labour Cost'; +$lang->custom->estimateHours = 'Daily Working Hours'; +$lang->custom->estimateDays = 'Working Days Per Week'; +$lang->custom->scaleFactor = 'Conversion factor'; +$lang->custom->region = 'Interval'; +$lang->custom->tips = 'Tips'; +$lang->custom->setTips = 'Set Tips'; +$lang->custom->isRange = 'Is Target Control'; +$lang->custom->concept = "Concept"; +$lang->custom->URStory = "User requirements"; +$lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; +$lang->custom->waterfallCommon = "Waterfall"; +$lang->custom->buildin = "Buildin"; +$lang->custom->isDefault = 'Is Default'; +$lang->custom->editStoryConcept = "Edit Story Concept"; +$lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; +$lang->custom->browseStoryConcept = "List of story concepts"; +$lang->custom->deleteStoryConcept = "Delete story Concept"; +$lang->custom->configureScrum = "Scrum Model Custom"; +$lang->custom->URConcept = "UR Concept"; +$lang->custom->SRConcept = "SR Concept"; +$lang->custom->oneUnit = "One {$lang->hourCommon}"; +$lang->custom->convertRelationTitle = "Conversion factor of {$lang->hourCommon} converted to %s"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -67,10 +68,11 @@ $lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)'; $lang->custom->tipRangeList[0] = 'No'; $lang->custom->tipRangeList[1] = 'Yes'; -$lang->custom->regionMustNumber = 'The interval must be a number!'; -$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; -$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; -$lang->custom->defaultNotEmpty = 'The default currency can not be empty'; +$lang->custom->regionMustNumber = 'The interval must be a number!'; +$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; +$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; +$lang->custom->defaultNotEmpty = 'The default currency can not be empty'; +$lang->custom->convertRelationTips = "After {$lang->hourCommon} is converted to %s, historical data will be uniformly converted to %s"; $lang->custom->numberError = 'The interval must be greater than zero!'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 1481547532..0d3194c2c6 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -1,55 +1,56 @@ custom->common = 'Personnalisation'; -$lang->custom->index = 'Accueil'; -$lang->custom->set = 'Personnaliser'; -$lang->custom->restore = 'Réinitialiser'; -$lang->custom->key = 'Clé'; -$lang->custom->value = 'Valeur'; -$lang->custom->flow = 'Concept'; -$lang->custom->working = 'Mode'; -$lang->custom->select = 'Choix du Concept'; -$lang->custom->branch = 'Multi-Branches'; -$lang->custom->owner = 'Propriétaire'; -$lang->custom->module = 'Module'; -$lang->custom->section = 'Section'; -$lang->custom->lang = 'Langue'; -$lang->custom->setPublic = 'Set Public'; -$lang->custom->required = 'Champ Obligatoire'; -$lang->custom->score = 'Point'; -$lang->custom->timezone = 'Timezone'; -$lang->custom->scoreReset = 'Réinit Points'; -$lang->custom->scoreTitle = 'Fonctionnalité des Points'; -$lang->custom->project = $lang->sprintCommon; -$lang->custom->product = $lang->productCommon; -$lang->custom->estimate = 'Estimated configuration'; -$lang->custom->estimateConfig = 'Estimated configuration'; -$lang->custom->estimateUnit = 'Estimating Unit'; -$lang->custom->estimateEfficiency = 'Productivity'; -$lang->custom->estimateCost = 'Unit Labour Cost'; -$lang->custom->estimateHours = 'Daily Working Hours'; -$lang->custom->estimateDays = 'Working Days Per Week'; -$lang->custom->convertRelations = 'Convert Relations'; -$lang->custom->region = 'Interval'; -$lang->custom->tips = 'Tips'; -$lang->custom->setTips = 'Set Tips'; -$lang->custom->isRange = 'Is Target Control'; -$lang->custom->concept = "Concept"; -$lang->custom->URStory = "User requirements"; -$lang->custom->SRStory = "Software requirements"; -$lang->custom->epic = "Epic"; -$lang->custom->scrumStory = "Story"; -$lang->custom->waterfallCommon = "Waterfall"; -$lang->custom->buildin = "Buildin"; -$lang->custom->isDefault = 'Is Default'; -$lang->custom->editStoryConcept = "Edit Story Concept"; -$lang->custom->setStoryConcept = "Set Story Concept"; -$lang->custom->setDefaultConcept = "Set Default Concept"; -$lang->custom->browseStoryConcept = "List of story concepts"; -$lang->custom->deleteStoryConcept = "Delete story Concept"; -$lang->custom->configureScrum = "Scrum Model Custom"; -$lang->custom->URConcept = "UR Concept"; -$lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = " One"; +$lang->custom->common = 'Personnalisation'; +$lang->custom->index = 'Accueil'; +$lang->custom->set = 'Personnaliser'; +$lang->custom->restore = 'Réinitialiser'; +$lang->custom->key = 'Clé'; +$lang->custom->value = 'Valeur'; +$lang->custom->flow = 'Concept'; +$lang->custom->working = 'Mode'; +$lang->custom->select = 'Choix du Concept'; +$lang->custom->branch = 'Multi-Branches'; +$lang->custom->owner = 'Propriétaire'; +$lang->custom->module = 'Module'; +$lang->custom->section = 'Section'; +$lang->custom->lang = 'Langue'; +$lang->custom->setPublic = 'Set Public'; +$lang->custom->required = 'Champ Obligatoire'; +$lang->custom->score = 'Point'; +$lang->custom->timezone = 'Timezone'; +$lang->custom->scoreReset = 'Réinit Points'; +$lang->custom->scoreTitle = 'Fonctionnalité des Points'; +$lang->custom->project = $lang->sprintCommon; +$lang->custom->product = $lang->productCommon; +$lang->custom->estimate = 'Estimated configuration'; +$lang->custom->estimateConfig = 'Estimated configuration'; +$lang->custom->estimateUnit = 'Estimating Unit'; +$lang->custom->estimateEfficiency = 'Productivity'; +$lang->custom->estimateCost = 'Unit Labour Cost'; +$lang->custom->estimateHours = 'Daily Working Hours'; +$lang->custom->estimateDays = 'Working Days Per Week'; +$lang->custom->scaleFactor = 'Conversion factor'; +$lang->custom->region = 'Interval'; +$lang->custom->tips = 'Tips'; +$lang->custom->setTips = 'Set Tips'; +$lang->custom->isRange = 'Is Target Control'; +$lang->custom->concept = "Concept"; +$lang->custom->URStory = "User requirements"; +$lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; +$lang->custom->waterfallCommon = "Waterfall"; +$lang->custom->buildin = "Buildin"; +$lang->custom->isDefault = 'Is Default'; +$lang->custom->editStoryConcept = "Edit Story Concept"; +$lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; +$lang->custom->browseStoryConcept = "List of story concepts"; +$lang->custom->deleteStoryConcept = "Delete story Concept"; +$lang->custom->configureScrum = "Scrum Model Custom"; +$lang->custom->URConcept = "UR Concept"; +$lang->custom->SRConcept = "SR Concept"; +$lang->custom->oneUnit = "One {$lang->hourCommon}"; +$lang->custom->convertRelationTitle = "Conversion factor of {$lang->hourCommon} converted to %s"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -67,10 +68,11 @@ $lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)'; $lang->custom->tipRangeList[0] = 'No'; $lang->custom->tipRangeList[1] = 'Yes'; -$lang->custom->regionMustNumber = 'The interval must be a number!'; -$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; -$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; -$lang->custom->defaultNotEmpty = 'The default currency can not be empty'; +$lang->custom->regionMustNumber = 'The interval must be a number!'; +$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; +$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; +$lang->custom->defaultNotEmpty = 'The default currency can not be empty'; +$lang->custom->convertRelationTips = "After {$lang->hourCommon} is converted to %s, historical data will be uniformly converted to %s"; $lang->custom->numberError = 'The interval must be greater than zero!'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 02b6334734..7fd65b7f2a 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -1,55 +1,56 @@ custom->common = 'Tùy biến'; -$lang->custom->index = 'Trang chủ'; -$lang->custom->set = 'Tùy biến'; -$lang->custom->restore = 'Thiết lập lại'; -$lang->custom->key = 'Khóa'; -$lang->custom->value = 'Giá trị'; -$lang->custom->flow = 'Mô hình'; -$lang->custom->working = 'Chế độ'; -$lang->custom->select = 'Chọn mô hình'; -$lang->custom->branch = 'Multi-Branch'; -$lang->custom->owner = 'Sở hữu'; -$lang->custom->module = 'Module'; -$lang->custom->section = 'Section'; -$lang->custom->lang = 'Ngôn ngữ'; -$lang->custom->setPublic = 'Thiết lập Public'; -$lang->custom->required = 'Trường bắt buộc'; -$lang->custom->score = 'Điểm'; -$lang->custom->timezone = 'Timezone'; -$lang->custom->scoreReset = 'Thiết lập lại điểm'; -$lang->custom->scoreTitle = 'Tính năng điểm'; -$lang->custom->project = $lang->sprintCommon; -$lang->custom->product = $lang->productCommon; -$lang->custom->estimate = 'Estimated configuration'; -$lang->custom->estimateConfig = 'Estimated configuration'; -$lang->custom->estimateUnit = 'Estimating Unit'; -$lang->custom->estimateEfficiency = 'Productivity'; -$lang->custom->estimateCost = 'Unit Labour Cost'; -$lang->custom->estimateHours = 'Daily Working Hours'; -$lang->custom->estimateDays = 'Working Days Per Week'; -$lang->custom->convertRelations = 'Convert Relations'; -$lang->custom->region = 'Interval'; -$lang->custom->tips = 'Tips'; -$lang->custom->setTips = 'Set Tips'; -$lang->custom->isRange = 'Is Target Control'; -$lang->custom->concept = "Concept"; -$lang->custom->URStory = "User requirements"; -$lang->custom->SRStory = "Software requirements"; -$lang->custom->epic = "Epic"; -$lang->custom->scrumStory = "Story"; -$lang->custom->waterfallCommon = "Waterfall"; -$lang->custom->buildin = "Buildin"; -$lang->custom->isDefault = 'Is Default'; -$lang->custom->editStoryConcept = "Edit Story Concept"; -$lang->custom->setStoryConcept = "Set Story Concept"; -$lang->custom->setDefaultConcept = "Set Default Concept"; -$lang->custom->browseStoryConcept = "List of story concepts"; -$lang->custom->deleteStoryConcept = "Delete story Concept"; -$lang->custom->configureScrum = "Scrum Model Custom"; -$lang->custom->URConcept = "UR Concept"; -$lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = " One"; +$lang->custom->common = 'Tùy biến'; +$lang->custom->index = 'Trang chủ'; +$lang->custom->set = 'Tùy biến'; +$lang->custom->restore = 'Thiết lập lại'; +$lang->custom->key = 'Khóa'; +$lang->custom->value = 'Giá trị'; +$lang->custom->flow = 'Mô hình'; +$lang->custom->working = 'Chế độ'; +$lang->custom->select = 'Chọn mô hình'; +$lang->custom->branch = 'Multi-Branch'; +$lang->custom->owner = 'Sở hữu'; +$lang->custom->module = 'Module'; +$lang->custom->section = 'Section'; +$lang->custom->lang = 'Ngôn ngữ'; +$lang->custom->setPublic = 'Thiết lập Public'; +$lang->custom->required = 'Trường bắt buộc'; +$lang->custom->score = 'Điểm'; +$lang->custom->timezone = 'Timezone'; +$lang->custom->scoreReset = 'Thiết lập lại điểm'; +$lang->custom->scoreTitle = 'Tính năng điểm'; +$lang->custom->project = $lang->sprintCommon; +$lang->custom->product = $lang->productCommon; +$lang->custom->estimate = 'Estimated configuration'; +$lang->custom->estimateConfig = 'Estimated configuration'; +$lang->custom->estimateUnit = 'Estimating Unit'; +$lang->custom->estimateEfficiency = 'Productivity'; +$lang->custom->estimateCost = 'Unit Labour Cost'; +$lang->custom->estimateHours = 'Daily Working Hours'; +$lang->custom->estimateDays = 'Working Days Per Week'; +$lang->custom->scaleFactor = 'Conversion factor'; +$lang->custom->region = 'Interval'; +$lang->custom->tips = 'Tips'; +$lang->custom->setTips = 'Set Tips'; +$lang->custom->isRange = 'Is Target Control'; +$lang->custom->concept = "Concept"; +$lang->custom->URStory = "User requirements"; +$lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; +$lang->custom->waterfallCommon = "Waterfall"; +$lang->custom->buildin = "Buildin"; +$lang->custom->isDefault = 'Is Default'; +$lang->custom->editStoryConcept = "Edit Story Concept"; +$lang->custom->setStoryConcept = "Set Story Concept"; +$lang->custom->setDefaultConcept = "Set Default Concept"; +$lang->custom->browseStoryConcept = "List of story concepts"; +$lang->custom->deleteStoryConcept = "Delete story Concept"; +$lang->custom->configureScrum = "Scrum Model Custom"; +$lang->custom->URConcept = "UR Concept"; +$lang->custom->SRConcept = "SR Concept"; +$lang->custom->oneUnit = "One {$lang->hourCommon}"; +$lang->custom->convertRelationTitle = "Conversion factor of {$lang->hourCommon} converted to %s"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -67,10 +68,11 @@ $lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)'; $lang->custom->tipRangeList[0] = 'No'; $lang->custom->tipRangeList[1] = 'Yes'; -$lang->custom->regionMustNumber = 'The interval must be a number!'; -$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; -$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; -$lang->custom->defaultNotEmpty = 'The default currency can not bu empty'; +$lang->custom->regionMustNumber = 'The interval must be a number!'; +$lang->custom->tipNotEmpty = 'The prompt can not be empty!'; +$lang->custom->currencyNotEmpty = 'You have to select one currency at least.'; +$lang->custom->defaultNotEmpty = 'The default currency can not bu empty'; +$lang->custom->convertRelationTips = "After {$lang->hourCommon} is converted to %s, historical data will be uniformly converted to %s"; $lang->custom->numberError = 'The interval must be greater than zero!'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index e7dba526ef..b45c4e001f 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -1,55 +1,56 @@ custom->common = '自定义'; -$lang->custom->index = '首页'; -$lang->custom->set = '自定义配置'; -$lang->custom->restore = '恢复默认'; -$lang->custom->key = '键'; -$lang->custom->value = '值'; -$lang->custom->flow = '流程'; -$lang->custom->working = '工作方式'; -$lang->custom->select = '请选择流程:'; -$lang->custom->branch = '多分支'; -$lang->custom->owner = '所有者'; -$lang->custom->module = '模块'; -$lang->custom->section = '附加部分'; -$lang->custom->lang = '所属语言'; -$lang->custom->setPublic = '设为公共'; -$lang->custom->required = '必填项'; -$lang->custom->score = '积分'; -$lang->custom->timezone = '时区'; -$lang->custom->scoreReset = '重置积分'; -$lang->custom->scoreTitle = '积分功能'; -$lang->custom->project = $lang->sprintCommon; -$lang->custom->product = $lang->productCommon; -$lang->custom->estimate = '估算配置'; -$lang->custom->estimateConfig = '估算配置'; -$lang->custom->estimateUnit = '估算单位'; -$lang->custom->estimateEfficiency = '生产率'; -$lang->custom->estimateCost = '单位人工成本'; -$lang->custom->estimateHours = '每日工时'; -$lang->custom->estimateDays = '每周工作天数'; -$lang->custom->convertRelations = '换算关系'; -$lang->custom->region = '区间'; -$lang->custom->tips = '提示语'; -$lang->custom->setTips = '设置提示语'; -$lang->custom->isRange = '是否目标控制范围'; -$lang->custom->concept = "项目概念"; -$lang->custom->URStory = "用户需求"; -$lang->custom->SRStory = "软件需求"; -$lang->custom->epic = "史诗"; -$lang->custom->scrumStory = "故事"; -$lang->custom->waterfallCommon = "瀑布"; -$lang->custom->buildin = "系统内置"; -$lang->custom->isDefault = '是否默认'; -$lang->custom->editStoryConcept = "编辑需求概念"; -$lang->custom->setStoryConcept = "设置需求概念"; -$lang->custom->setDefaultConcept = "设置默认概念"; -$lang->custom->browseStoryConcept = "需求概念列表"; -$lang->custom->deleteStoryConcept = "删除需求概念"; -$lang->custom->configureScrum = "敏捷模型自定义"; -$lang->custom->URConcept = "用需概念"; -$lang->custom->SRConcept = "软需概念"; -$lang->custom->one = "一个"; +$lang->custom->common = '自定义'; +$lang->custom->index = '首页'; +$lang->custom->set = '自定义配置'; +$lang->custom->restore = '恢复默认'; +$lang->custom->key = '键'; +$lang->custom->value = '值'; +$lang->custom->flow = '流程'; +$lang->custom->working = '工作方式'; +$lang->custom->select = '请选择流程:'; +$lang->custom->branch = '多分支'; +$lang->custom->owner = '所有者'; +$lang->custom->module = '模块'; +$lang->custom->section = '附加部分'; +$lang->custom->lang = '所属语言'; +$lang->custom->setPublic = '设为公共'; +$lang->custom->required = '必填项'; +$lang->custom->score = '积分'; +$lang->custom->timezone = '时区'; +$lang->custom->scoreReset = '重置积分'; +$lang->custom->scoreTitle = '积分功能'; +$lang->custom->project = $lang->sprintCommon; +$lang->custom->product = $lang->productCommon; +$lang->custom->estimate = '估算配置'; +$lang->custom->estimateConfig = '估算配置'; +$lang->custom->estimateUnit = '估算单位'; +$lang->custom->estimateEfficiency = '生产率'; +$lang->custom->estimateCost = '单位人工成本'; +$lang->custom->estimateHours = '每日工时'; +$lang->custom->estimateDays = '每周工作天数'; +$lang->custom->scaleFactor = '换算系数'; +$lang->custom->region = '区间'; +$lang->custom->tips = '提示语'; +$lang->custom->setTips = '设置提示语'; +$lang->custom->isRange = '是否目标控制范围'; +$lang->custom->concept = "项目概念"; +$lang->custom->URStory = "用户需求"; +$lang->custom->SRStory = "软件需求"; +$lang->custom->epic = "史诗"; +$lang->custom->scrumStory = "故事"; +$lang->custom->waterfallCommon = "瀑布"; +$lang->custom->buildin = "系统内置"; +$lang->custom->isDefault = '是否默认'; +$lang->custom->editStoryConcept = "编辑需求概念"; +$lang->custom->setStoryConcept = "设置需求概念"; +$lang->custom->setDefaultConcept = "设置默认概念"; +$lang->custom->browseStoryConcept = "需求概念列表"; +$lang->custom->deleteStoryConcept = "删除需求概念"; +$lang->custom->configureScrum = "敏捷模型自定义"; +$lang->custom->URConcept = "用需概念"; +$lang->custom->SRConcept = "软需概念"; +$lang->custom->oneUnit = "一个{$lang->hourCommon}"; +$lang->custom->convertRelationTitle = "{$lang->hourCommon}转换为%s的换算系数"; $lang->custom->unitList['efficiency'] = '工时/'; $lang->custom->unitList['manhour'] = '人时/'; @@ -67,10 +68,11 @@ $lang->custom->tipCostList['CV'] = '成本偏差率(CV%)'; $lang->custom->tipRangeList[0] = '否'; $lang->custom->tipRangeList[1] = '是'; -$lang->custom->regionMustNumber = '区间必须是数字'; -$lang->custom->tipNotEmpty = '提示语不能为空'; -$lang->custom->currencyNotEmpty = '至少选择一种货币'; -$lang->custom->defaultNotEmpty = '默认货币不能为空'; +$lang->custom->regionMustNumber = '区间必须是数字'; +$lang->custom->tipNotEmpty = '提示语不能为空'; +$lang->custom->currencyNotEmpty = '至少选择一种货币'; +$lang->custom->defaultNotEmpty = '默认货币不能为空'; +$lang->custom->convertRelationTips = "{$lang->hourCommon}转换为%s后,历史数据将被统一转换为%s"; $lang->custom->numberError = '区间必须大于零'; diff --git a/module/custom/view/estimate.html.php b/module/custom/view/estimate.html.php index de13cf7456..279085dc3b 100644 --- a/module/custom/view/estimate.html.php +++ b/module/custom/view/estimate.html.php @@ -3,6 +3,10 @@ custom->conceptOptions->hourPoint[1]);?> custom->conceptOptions->hourPoint[2]);?> custom->unitList['efficiency']);?> +custom->convertRelationTitle);?> +custom->convertRelationTips);?> +lang->error->notempty, $this->lang->custom->scaleFactor));?> +lang->error->float, $this->lang->custom->scaleFactor));?> custom->object = array(); @@ -11,6 +15,7 @@ $lang->custom->system[] = 'estimate'; ?>