From be38a438e2d881b88e492ba1de5ae0fccc036fdf Mon Sep 17 00:00:00 2001 From: fram Date: Fri, 8 Nov 2013 11:39:59 +0100 Subject: [PATCH] // sprintf & English --- controllers/admin/AdminCurrenciesController.php | 2 +- controllers/admin/AdminSpecificPriceRuleController.php | 2 +- themes/default-bootstrap/pagination.tpl | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index db24554ea..0aa4594aa 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -340,7 +340,7 @@ class AdminCurrenciesControllerCore extends AdminController if (Tools::isSubmit('submitAddcurrency') && !Tools::getValue('id_currency') && Currency::exists(Tools::getValue('iso_code'), Tools::getValue('iso_code_num'))) $this->errors[] = Tools::displayError('This currency already exists.'); if (Tools::isSubmit('submitAddcurrency') && (float)Tools::getValue('conversion_rate') <= 0) - $this->errors[] = Tools::displayError('This currency conversion rate can not be equal to 0.'); + $this->errors[] = Tools::displayError('The currency conversion rate can not be equal to 0.'); parent::initProcess(); } diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php index 0e40081b3..61a98384e 100755 --- a/controllers/admin/AdminSpecificPriceRuleController.php +++ b/controllers/admin/AdminSpecificPriceRuleController.php @@ -121,7 +121,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController if (empty($this->display)) $this->page_header_toolbar_btn['new_specific_price_rule'] = array( 'href' => self::$currentIndex.'&addspecific_price_rule&token='.$this->token, - 'desc' => $this->l('Add new specific rule'), + 'desc' => $this->l('Add new catalog price rule'), 'icon' => 'process-icon-new' ); diff --git a/themes/default-bootstrap/pagination.tpl b/themes/default-bootstrap/pagination.tpl index d1fe316c1..fddd8725c 100644 --- a/themes/default-bootstrap/pagination.tpl +++ b/themes/default-bootstrap/pagination.tpl @@ -123,7 +123,12 @@ {else} {assign var='productShowingStart' value=$n*$p-$n+1} {/if} - {l s='Showing'} {$productShowingStart} - {$productShowing} {l s='of'} {$nb_products}{if $nb_products > 1} {l s='items'}{else} {l s='item'}{/if} + + {if $nb_products > 1} + {l s='Showing %1$d - %2$d of %3$d items' sprintf=[$productShowingStart, $productShowing, $nb_products]} + {else} + {l s='Showing %1$d - %2$d of 1 item' sprintf=[$productShowingStart, $productShowing]} + {/if} {/if}