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

Merge pull request #949 from djfm/bootstrap

Browse Source 
// sprintf & English
This commit is contained in:
Jérôme Nadaud
2013-11-08 02:45:04 -08:00
parent 42af175d22 be38a438e2
commit 6f70c77d41
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCurrenciesController.php
+1 -1
View File
@@ -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'))) 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.'); $this->errors[] = Tools::displayError('This currency already exists.');
if (Tools::isSubmit('submitAddcurrency') && (float)Tools::getValue('conversion_rate') <= 0) 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(); parent::initProcess();
} }
controllers/admin/AdminSpecificPriceRuleController.php
+1 -1
View File
@@ -121,7 +121,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
if (empty($this->display)) if (empty($this->display))
$this->page_header_toolbar_btn['new_specific_price_rule'] = array( $this->page_header_toolbar_btn['new_specific_price_rule'] = array(
'href' => self::$currentIndex.'&amp;addspecific_price_rule&amp;token='.$this->token, 'href' => self::$currentIndex.'&amp;addspecific_price_rule&amp;token='.$this->token,
'desc' => $this->l('Add new specific rule'), 'desc' => $this->l('Add new catalog price rule'),
'icon' => 'process-icon-new' 'icon' => 'process-icon-new'
); );
themes/default-bootstrap/pagination.tpl
+6 -1
View File
@@ -123,7 +123,12 @@
{else} {else}
{assign var='productShowingStart' value=$n*$p-$n+1} {assign var='productShowingStart' value=$n*$p-$n+1}
{/if} {/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}
</div> </div>
<!-- /Pagination --> <!-- /Pagination -->
{/if} {/if}