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}{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}{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}
{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}
{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} -