diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index f1d6ef7f2..51bb3abf0 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -63,8 +63,8 @@ class GuestTrackingControllerCore extends FrontController $this->errors[] = Tools::displayError('There is no account associated with this e-mail address'); else if (Customer::customerExists($email, false, true)) { - $this->errors[] = Tools::displayError('Your guest account has already been transformed into a customer account. - Please log-in to your customer account to view this order, this section is reserved for guest accounts'); + $this->errors[] = Tools::displayError('Your guest account has already been transformed into a customer account.').' '. + Tools::displayError('Please log-in to your customer account to view this order, this section is reserved for guest accounts'); $this->context->smarty->assign('show_login_link', true); } else if (!Validate::isLoadedObject($order)) diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl index ec75974fa..3282cb272 100644 --- a/themes/default/authentication.tpl +++ b/themes/default/authentication.tpl @@ -141,7 +141,7 @@ $(function(){ldelim} {if {$authentification_error|@count} == 1}

{l s='There is one error'} :

{else} -

{l s='There are'}{$account_error|@count} {l s='errors'} :

+

{l s='There are %s errors' sprintf=[$account_error|@count]} :

{/if}
    {foreach from=$authentification_error item=v} @@ -354,7 +354,7 @@ $(function(){ldelim} {if {$account_error|@count} == 1}

    {l s='There is one error'} :

    {else} -

    {l s='There are'}{$account_error|@count} {l s='errors'} :

    +

    {l s='There are %s errors' sprintf=[$account_error|@count]} :

    {/if}
      {foreach from=$account_error item=v} diff --git a/themes/default/breadcrumb.tpl b/themes/default/breadcrumb.tpl index 968de57f9..573a0ccc3 100644 --- a/themes/default/breadcrumb.tpl +++ b/themes/default/breadcrumb.tpl @@ -27,7 +27,7 @@ {if isset($smarty.capture.path)}{assign var='path' value=$smarty.capture.path}{/if} @@ -383,7 +383,7 @@ {/if} {if isset($errors) && $errors}
      -

      {if $errors|@count > 1}{l s='There are'}{else}{l s='There is'}{/if} {$errors|@count} {if $errors|@count > 1}{l s='errors'}{else}{l s='error'}{/if} :

      +

      {if $errors|@count > 1}{l s='There are %d errors' sprintf=$errors|@count}{else}{l s='There is %d error' sprintf=$errors|@count}{/if}

        {foreach from=$errors key=k item=error}
      1. {$error}
      2. diff --git a/themes/default/order-payment.tpl b/themes/default/order-payment.tpl index 6c02a0059..126737755 100644 --- a/themes/default/order-payment.tpl +++ b/themes/default/order-payment.tpl @@ -75,12 +75,12 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total products'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total products (tax excl.):'}{else}{l s='Total products:'}{/if} {displayPrice price=$total_products} {else} - {l s='Total products'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total products (tax incl.):'}{else}{l s='Total products:'}{/if} {displayPrice price=$total_products_wt} {/if} @@ -94,9 +94,9 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total vouchers'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total vouchers (tax excl.):'}{else}{l s='Total vouchers:'}{/if} {else} - {l s='Total vouchers'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total vouchers (tax incl.):'}{else}{l s='Total vouchers:'}{/if} {/if} {else} {l s='Total vouchers:'} @@ -118,9 +118,9 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total gift-wrapping (tax excl.):'}{else}{l s='Total gift-wrapping:'}{/if} {else} - {l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total gift-wrapping (tax incl.):'}{else}{l s='Total gift-wrapping:'}{/if} {/if} {else} {l s='Total gift-wrapping:'} @@ -141,12 +141,12 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total shipping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}} {displayPrice price=$shippingCostTaxExc} {else} - {l s='Total shipping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if} {displayPrice price=$shippingCost} {/if} @@ -238,7 +238,7 @@
      {elseif $type == $CUSTOMIZE_TEXTFIELD} {/if} {/foreach} diff --git a/themes/default/order-return.tpl b/themes/default/order-return.tpl index ff421d669..040ddcc9f 100644 --- a/themes/default/order-return.tpl +++ b/themes/default/order-return.tpl @@ -68,7 +68,7 @@ {/if} diff --git a/themes/default/order-slip.tpl b/themes/default/order-slip.tpl index 56d504395..01fe371a4 100644 --- a/themes/default/order-slip.tpl +++ b/themes/default/order-slip.tpl @@ -43,12 +43,12 @@ {foreach from=$ordersSlip item=slip name=myLoop} - {l s='#'}{$slip.id_order_slip|string_format:"%06d"} - {l s='#'}{$slip.id_order|string_format:"%06d"} + {l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"} + {l s='#%s' sprintf=$slip.id_order|string_format:"%06d"} {dateFormat date=$slip.date_add full=0} - {l s='Order slip'} {l s='#'}{$slip.id_order_slip|string_format: - {l s='PDF'} + {l s='Order slip'} {l s='#%s' sprintf=$slip.id_order_slip|string_format: + {l s='PDF'} {/foreach} diff --git a/themes/default/product-compare.tpl b/themes/default/product-compare.tpl index b44063a63..72230d7f8 100644 --- a/themes/default/product-compare.tpl +++ b/themes/default/product-compare.tpl @@ -28,7 +28,7 @@ diff --git a/themes/default/products-comparison.tpl b/themes/default/products-comparison.tpl index ab434158c..88727c8a1 100644 --- a/themes/default/products-comparison.tpl +++ b/themes/default/products-comparison.tpl @@ -62,7 +62,7 @@ {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} {math equation="pprice / punit_price" pprice=$product->getPrice($taxes_behavior) punit_price=$product->unit_price_ratio assign=unit_price} -

      {convertPrice price=$unit_price} {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}

      +

      {convertPrice price=$unit_price} {l s='per %d' sprintf=$product->unity|escape:'htmlall':'UTF-8'}

      {else}   {/if} diff --git a/themes/default/search.tpl b/themes/default/search.tpl index f9ff988ca..f56cb53b3 100644 --- a/themes/default/search.tpl +++ b/themes/default/search.tpl @@ -44,7 +44,7 @@ {/if}

      {else} -

      {$nbProducts|intval} {if $nbProducts == 1}{l s='result has been found.'}{else}{l s='results have been found.'}{/if}

      +

      {if $nbProducts == 1}{l s='%d result has been found.' sprintf=$nbProducts|intval}{else}{l s='%d results have been found.' sprintf=$nbProducts|intva}{/if}

      {if !isset($instantSearch) || (isset($instantSearch) && !$instantSearch)}
      diff --git a/themes/default/shopping-cart-product-line.tpl b/themes/default/shopping-cart-product-line.tpl index a0654af34..6ae490f5e 100644 --- a/themes/default/shopping-cart-product-line.tpl +++ b/themes/default/shopping-cart-product-line.tpl @@ -68,7 +68,7 @@ {l s='Subtract'} {else} - + {l s='Subtract'} {/if} diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl index 83c31f2ea..ecfc7161e 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -85,12 +85,12 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total products'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total products (tax excl.):'}{else}{l s='Total products:'}{/if} {displayPrice price=$total_products} {else} - {l s='Total products'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total products (tax incl.):'}{else}{l s='Total products:'}{/if} {displayPrice price=$total_products_wt} {/if} @@ -104,9 +104,9 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total vouchers'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total vouchers (tax excl.):'}{else}{l s='Total vouchers:'}{/if} {else} - {l s='Total vouchers'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total vouchers (tax incl.):'}{else}{l s='Total vouchers:'}{/if} {/if} {else} {l s='Total vouchers:'} @@ -128,9 +128,9 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total gift-wrapping (tax excl.):'}{else}{l s='Total gift-wrapping:'}{/if} {else} - {l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total gift-wrapping (tax incl.):'}{else}{l s='Total gift-wrapping:'}{/if} {/if} {else} {l s='Total gift-wrapping:'} @@ -151,12 +151,12 @@ {if $use_taxes} {if $priceDisplay} - {l s='Total shipping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if} {displayPrice price=$shippingCostTaxExc} {else} - {l s='Total shipping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if} {displayPrice price=$shippingCost} {/if} diff --git a/themes/default/supplier-list.tpl b/themes/default/supplier-list.tpl index 020a15b00..8224b0a8d 100644 --- a/themes/default/supplier-list.tpl +++ b/themes/default/supplier-list.tpl @@ -37,9 +37,11 @@ {if $nbSuppliers == 0}{l s='There are no suppliers.'} {else} - {if $nbSuppliers == 1}{l s='There is'}{else}{l s='There are'}{/if}  - {$nbSuppliers}  - {if $nbSuppliers == 1}{l s='supplier.'}{else}{l s='suppliers.'}{/if} + {if $nbSuppliers == 1} + {l s='There is %d supplier.' sprintf=$nbSuppliers} + {else} + {l s='There are %d suppliers.' sprintf=$nbSuppliers} + {/if} {/if} {/strip}

      @@ -81,7 +83,7 @@ {if $supplier.nb_products > 0} {/if} - {$supplier.nb_products|intval} {if $supplier.nb_products == 1}{l s='product'}{else}{l s='products'}{/if} + {if $supplier.nb_products == 1}{l s='%d product' sprintf=$supplier.nb_products|intval}{else}{l s='%d products' sprintf=$supplier.nb_products|intval}{/if} {if $supplier.nb_products > 0} {/if}