dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #939 from djfm/bootstrap

Browse Source 
Translations (EN) / Mails / Fix Column
This commit is contained in:
Kevin Granger
2013-11-07 05:08:16 -08:00
parent 9e76f82fb5 1bb550cf63
commit 63e31a4585
77 changed files with 187 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminDashboardController.php
+2 -2
View File
@@ -86,7 +86,7 @@ class AdminDashboardControllerCore extends AdminController
{
$forms['payment']['fields']['CONF_'.strtoupper($module->name).'_FIXED'] = array(
'title' => $module->displayName,
'desc' => sprintf($this->l('Choose a fixed fee for each order placed in %s with %s.'), $currency->iso_code, $module->displayName),
'desc' => sprintf($this->l('Choose a fixed fee for each order placed in %1$s with %2$s.'), $currency->iso_code, $module->displayName),
'validation' => 'isPrice',
'cast' => 'floatval',
'type' => 'text',
@@ -95,7 +95,7 @@ class AdminDashboardControllerCore extends AdminController
);
$forms['payment']['fields']['CONF_'.strtoupper($module->name).'_VAR'] = array(
'title' => $module->displayName,
'desc' => sprintf($this->l('Choose a variable fee for each order placed in %s with %s. It will be applied on the total paid with taxes.'), $currency->iso_code, $module->displayName),
'desc' => sprintf($this->l('Choose a variable fee for each order placed in %1$s with %2$s. It will be applied on the total paid with taxes.'), $currency->iso_code, $module->displayName),
'validation' => 'isPercentage',
'cast' => 'floatval',
'type' => 'text',