// Merge -> revision 9385

This commit is contained in:
rMalie
2011-10-17 09:55:33 +00:00
parent e6f45e54a6
commit f1d5a3bf77
15 changed files with 51 additions and 17 deletions
+1 -1
View File
@@ -79,7 +79,7 @@ class Blockrss extends Module
elseif (stristr($urlfeed, $_SERVER['HTTP_HOST'].__PS_BASE_URI__))
$errors[] = $this->l('You have selected a feed URL on your own website. Please choose another URL');
elseif (!($contents = @file_get_contents($urlfeed)))
$errors[] = $this->l('Feed is unreacheable, check your URL');
$errors[] = $this->l('Feed is unreachable, check your URL');
/* Even if the feed was reachable, We need to make sure that the feed is well formated */
else
{
+1 -1
View File
@@ -9,7 +9,7 @@ $_MODULE['<{blockrss}prestashop>blockrss_6706b6d8ba45cc4f0eda0506ba1dc3c8'] = 'U
$_MODULE['<{blockrss}prestashop>blockrss_36ed65ce17306e812fd68d9f634c0c57'] = 'Titre invalide';
$_MODULE['<{blockrss}prestashop>blockrss_1b3d34e25aef32a3c8daddfff856577f'] = 'Nombre de flux invalide';
$_MODULE['<{blockrss}prestashop>blockrss_e423bd72f5aa1be13216c5abbd3deb45'] = 'Vous avez choisi le flux RSS de votre site. Veuillez choisir une autre URL';
$_MODULE['<{blockrss}prestashop>blockrss_7a82db9ac04c55697040556e5cc9dc7c'] = 'Flux introuvable, vérifez votre URL';
$_MODULE['<{blockrss}prestashop>blockrss_bef637cd0e222a8b56676cb64ce75258'] = 'Le flux est inaccessible, vérifiez votre URL';
$_MODULE['<{blockrss}prestashop>blockrss_1844ef1bfaa030dc8423c4645a43525c'] = 'Flux invalide :';
$_MODULE['<{blockrss}prestashop>blockrss_c888438d14855d7d96a2724ee9c306bd'] = 'Paramètres mis à jour';
$_MODULE['<{blockrss}prestashop>blockrss_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';