diff --git a/module/custom/control.php b/module/custom/control.php index 648c51b678..416bcd8da1 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -52,8 +52,8 @@ class custom extends control { $this->app->loadConfig($module); $unitList = zget($this->config->$module, 'unitList', ''); - $this->view->unitList = explode(',', $unitList); - $this->view->mainCurrency = zget($this->config->$module, 'mainCurrency', 'CNY'); + $this->view->unitList = explode(',', $unitList); + $this->view->defaultCurrency = zget($this->config->$module, 'defaultCurrency', 'CNY'); } if(($module == 'story' or $module == 'testcase') and $field == 'review') { @@ -94,7 +94,7 @@ class custom extends control { $data = fixer::input('post')->join('unitList', ',')->get(); if(empty($data->unitList)) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->currencyNotEmpty)); - if(empty($data->mainCurrency)) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->mainCurrencyNotEmpty)); + if(empty($data->defaultCurrency)) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->defaultNotEmpty)); $this->loadModel('setting')->setItems("system.$module", $data); } elseif($module == 'story' and $field == 'review') diff --git a/module/custom/js/set.js b/module/custom/js/set.js index 29772b3968..0236338696 100644 --- a/module/custom/js/set.js +++ b/module/custom/js/set.js @@ -16,8 +16,8 @@ $(function() $('[name*=unitList]').change(function() { - var mainCurrency = $('#mainCurrency').val(); - $('#mainCurrency').empty().append(''); + var defaultCurrency = $('#defaultCurrency').val(); + $('#defaultCurrency').empty().append(''); $('[name*=unitList]').each(function() { if($(this).prop('checked')) @@ -26,12 +26,12 @@ $('[name*=unitList]').change(function() var firstStr = $(this).val() + '">'; text = text.substring(text.lastIndexOf(firstStr) + firstStr.length, text.lastIndexOf('<')); - $('#mainCurrency').append("'); + $('#defaultCurrency').append("'); } }); - $('#mainCurrency').val(mainCurrency); - $("#mainCurrency").trigger("chosen:updated"); + $('#defaultCurrency').val(defaultCurrency); + $("#defaultCurrency").trigger("chosen:updated"); }); $('[name*=unitList]').change(); diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index b7a7949acc..447b9286e5 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -67,10 +67,10 @@ $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->mainCurrencyNotEmpty = 'The main 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 be empty'; $lang->custom->numberError = 'The interval must be greater than zero!'; @@ -91,7 +91,7 @@ $lang->custom->object['block'] = 'ClosedBlock'; $lang->custom->program = new stdClass(); $lang->custom->program->currencySetting = 'Currency Setting'; -$lang->custom->program->mainCurrency = 'Main Currency'; +$lang->custom->program->defaultCurrency = 'Default Currency'; $lang->custom->program->fields['unitList'] = 'Unit List'; $lang->custom->story = new stdClass(); diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 542e596ff9..6e99070d28 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -67,10 +67,10 @@ $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->mainCurrencyNotEmpty = 'The main 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 be empty'; $lang->custom->numberError = 'The interval must be greater than zero!'; @@ -91,7 +91,7 @@ $lang->custom->object['block'] = 'Block'; $lang->custom->program = new stdClass(); $lang->custom->program->currencySetting = 'Currency Setting'; -$lang->custom->program->mainCurrency = 'Main Currency'; +$lang->custom->program->defaultCurrency = 'Default Currency'; $lang->custom->program->fields['unitList'] = 'Unit List'; $lang->custom->story = new stdClass(); diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 73b739055e..1481547532 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -67,10 +67,10 @@ $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->mainCurrencyNotEmpty = 'The main 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 be empty'; $lang->custom->numberError = 'The interval must be greater than zero!'; @@ -91,7 +91,7 @@ $lang->custom->object['block'] = 'Bloc'; $lang->custom->program = new stdClass(); $lang->custom->program->currencySetting = 'Currency Setting'; -$lang->custom->program->mainCurrency = 'Main Currency'; +$lang->custom->program->defaultCurrency = 'Default Currency'; $lang->custom->program->fields['unitList'] = 'Unit List'; $lang->custom->story = new stdClass(); diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 9cc8118dd1..02b6334734 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -67,10 +67,10 @@ $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->mainCurrencyNotEmpty = 'The main 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->numberError = 'The interval must be greater than zero!'; @@ -91,7 +91,7 @@ $lang->custom->object['block'] = 'Block'; $lang->custom->program = new stdClass(); $lang->custom->program->currencySetting = 'Currency Setting'; -$lang->custom->program->mainCurrency = 'Main Currency'; +$lang->custom->program->defaultCurrency = 'Default Currency'; $lang->custom->program->fields['unitList'] = 'Unit List'; $lang->custom->story = new stdClass(); diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index ab0c265664..e7dba526ef 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -67,10 +67,10 @@ $lang->custom->tipCostList['CV'] = '成本偏差率(CV%)'; $lang->custom->tipRangeList[0] = '否'; $lang->custom->tipRangeList[1] = '是'; -$lang->custom->regionMustNumber = '区间必须是数字'; -$lang->custom->tipNotEmpty = '提示语不能为空'; -$lang->custom->currencyNotEmpty = '至少选择一种货币'; -$lang->custom->mainCurrencyNotEmpty = '主要货币不能为空'; +$lang->custom->regionMustNumber = '区间必须是数字'; +$lang->custom->tipNotEmpty = '提示语不能为空'; +$lang->custom->currencyNotEmpty = '至少选择一种货币'; +$lang->custom->defaultNotEmpty = '默认货币不能为空'; $lang->custom->numberError = '区间必须大于零'; @@ -91,7 +91,7 @@ $lang->custom->object['block'] = '区块'; $lang->custom->program = new stdClass(); $lang->custom->program->currencySetting = '货币设置'; -$lang->custom->program->mainCurrency = '主要货币'; +$lang->custom->program->defaultCurrency = '默认货币'; $lang->custom->program->fields['unitList'] = '预算单位'; $lang->custom->story = new stdClass(); diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index 2f7d281ffd..329768c5a6 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -45,7 +45,7 @@ $lang->custom->configureScrum = "敏捷自定義"; $lang->custom->object['program'] = '項目'; $lang->custom->program->currencySetting = '貨幣設置'; -$lang->custom->program->mainCurrency = '主要貨幣'; +$lang->custom->program->defaultCurrency = '默認貨幣'; $lang->custom->program->fields['unitList'] = '預算單位'; $lang->custom->unitList['efficiency'] = '工時/'; @@ -64,10 +64,10 @@ $lang->custom->tipCostList['CV'] = '成本偏差率(CV%)'; $lang->custom->tipRangeList[0] = '否'; $lang->custom->tipRangeList[1] = '是'; -$lang->custom->regionMustNumber = '區間必須是數字'; -$lang->custom->tipNotEmpty = '提示語不能為空'; -$lang->custom->currencyNotEmpty = '至少選擇一種貨幣'; -$lang->custom->mainCurrencyNotEmpty = '主要貨幣不能為空'; +$lang->custom->regionMustNumber = '區間必須是數字'; +$lang->custom->tipNotEmpty = '提示語不能為空'; +$lang->custom->currencyNotEmpty = '至少選擇一種貨幣'; +$lang->custom->defaultNotEmpty = '默認貨幣不能為空'; $lang->custom->numberError = '區間必須大於零'; diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 5b439cdf05..d5c135dbb6 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -63,8 +63,8 @@ EOT;