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

Merge pull request #691 from djfm/development

Browse Source 
// fixed translation of modules descriptions containing quotes
This commit is contained in:
Damien Metzger committed 2013-09-23 07:51:57 -07:00
2 parents c6222c51c8 0a9f425281
commit 6796b64e18
3 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
+1 -1
View File
@@ -45,7 +45,7 @@
{l s='The field `request_uri` is the URL from which the customers come to your website.'}<br /> {l s='The field `request_uri` is the URL from which the customers come to your website.'}<br />
{l s='For example, if the visitor accesses a product page, the URL will be'} "{$uri}music-ipods/1-ipod-nano.html".<br /> {l s='For example, if the visitor accesses a product page, the URL will be'} "{$uri}music-ipods/1-ipod-nano.html".<br />
{l s='This is helpful because you can add tags or tokens in the links pointing to your website.'} {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.'} {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.'}
</li> </li>
<br /> <br />
classes/module/Module.php
+1 -1
View File
@@ -938,7 +938,7 @@ abstract class ModuleCore
public static function configXmlStringFormat($string) public static function configXmlStringFormat($string)
{ {
return str_replace('\'', '\\\'', Tools::htmlentitiesDecodeUTF8($string)); return Tools::htmlentitiesDecodeUTF8($string);
} }
install-dev/langs/br/data/quick_access.xml
+4 -4
View File
@@ -1,8 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<entity_quick_access> <entity_quick_access>
<quick_access id="Home" name="Home"/> <quick_access id="Home" name="Home"/>
<quick_access id="My_Shop" name="My Shop"/> <quick_access id="My_Shop" name="Minha Loja"/>
<quick_access id="New_category" name="New category"/> <quick_access id="New_category" name="Nova Categoria"/>
<quick_access id="New_product" name="New product"/> <quick_access id="New_product" name="Novo Produto"/>
<quick_access id="New_voucher" name="New voucher"/> <quick_access id="New_voucher" name="Novo Cupom"/>
</entity_quick_access> </entity_quick_access>