From 87567ed1a05ad5a348b432d9a01ad04f627074ad Mon Sep 17 00:00:00 2001 From: djfm Date: Wed, 4 Sep 2013 07:44:52 +0000 Subject: [PATCH 1/3] // fixed translation of modules descriptions containing quotes --- classes/module/Module.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/module/Module.php b/classes/module/Module.php index f6b2fd8fd..2e911e26d 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -935,7 +935,7 @@ abstract class ModuleCore public static function configXmlStringFormat($string) { - return str_replace('\'', '\\\'', Tools::htmlentitiesDecodeUTF8($string)); + return Tools::htmlentitiesDecodeUTF8($string); } From 641cf225f2cfbf2eecea6d74db1327017b322efd Mon Sep 17 00:00:00 2001 From: djfm Date: Mon, 9 Sep 2013 09:47:44 +0000 Subject: [PATCH 2/3] // fix small translation bug PSCFV-10329 --- .../template/controllers/referrers/helpers/form/form.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl index fa1244e65..01c588730 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl @@ -45,7 +45,7 @@ {l s='The field `request_uri` is the URL from which the customers come to your website.'}
{l s='For example, if the visitor accesses a product page, the URL will be'} "{$uri}music-ipods/1-ipod-nano.html".
{l s='This is helpful because you can add tags or tokens in the links pointing to your website.'} - {l s='For example, you can post a link "%dindex.php?prestashop" in the forum and get statistics by entering "%prestashop" in the field `request_uri`. '} + {l s='For example, you can post a link "%1$sindex.php?prestashop" in the forum and get statistics by entering "%%prestashop" in the field `request_uri`. ' sprintf=[$uri]} {l s='This method is more reliable than the `http_referer`, but there is one disadvantage. If a search engine references a page with your link, then it will be displayed in the search results and you will not only have visitors from the forum, but also those from the search engine.'}
From 65559c5cf401fab42d742e9c5e7f2b025e03e5dd Mon Sep 17 00:00:00 2001 From: djfm Date: Wed, 18 Sep 2013 16:08:23 +0000 Subject: [PATCH 3/3] // small improvement to Brazilian translations --- install-dev/langs/br/data/quick_access.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install-dev/langs/br/data/quick_access.xml b/install-dev/langs/br/data/quick_access.xml index 72e5a5b9b..6791c4339 100644 --- a/install-dev/langs/br/data/quick_access.xml +++ b/install-dev/langs/br/data/quick_access.xml @@ -1,8 +1,8 @@ - - - - + + + +