Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[-] MO : Modules updated for russian translations compatibility

  • Loading branch information...
commit 8650ff2029cde360fbdfb4b733b75257519f9b5d 1 parent d2ed2bb
@gaillafr gaillafr authored
View
4 jirafe/config.xml
@@ -2,7 +2,7 @@
<module>
<name>jirafe</name>
<displayName><![CDATA[Analytics for ecommerce]]></displayName>
- <version><![CDATA[1.2.2]]></version>
+ <version><![CDATA[1.2.3]]></version>
<description><![CDATA[The best analytics for ecommerce merchants. Deeply integrated into the Prestashop platform.]]></description>
<author><![CDATA[Jirafe Inc.]]></author>
<tab><![CDATA[analytics_stats]]></tab>
@@ -10,4 +10,4 @@
<is_configurable>0</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
-</module>
+</module>
View
25 jirafe/jirafe14.php
@@ -45,7 +45,7 @@ public function __construct()
$this->name = 'jirafe';
$this->tab = 'analytics_stats';
- $this->version = '1.2.2';
+ $this->version = '1.2.3';
//The constructor must be called after the name has been set, but before you try to use any functions like $this->l()
parent::__construct();
@@ -63,21 +63,16 @@ public function __construct()
$this->confirmUninstall = $this->l('Are you sure you want to remove Jirafe analytics integration for your site?');
$this->checkConfig();
-
}
-
+
public function checkConfig()
{
- // Check configurations
- $warnings = array();
if (!in_array(ini_get('allow_url_fopen'), array('On', 'on', '1')))
- $warnings[] = $this->l('allow_url_fopen be enabled on your server to use this module.');
+ $this->warnings[] = $this->l('allow_url_fopen be enabled on your server to use this module.');
if (!is_callable('curl_exec'))
- $warnings[] = $this->l('cURL extension must be enabled on your server to use this module.');
- if (!empty($warnings))
- $this->warning = implode(',<br />', $warnings);
- return (bool)count($warnings);
- }
+ $this->warnings[] = $this->l('cURL extension must be enabled on your server to use this module.');
+ return (bool) (count($this->warnings) ? false : true);
+ }
public function getPrestashopClient()
{
@@ -112,11 +107,11 @@ public function getJirafeClient()
public function install()
{
- if ($this->checkConfig() === true)
- {
- echo '<div class="warning">'.Tools::safeOutput($this->warning).'</div>';
+ if ($this->checkConfig() === false)
+ {
+ $this->displayError(implode(',<br />', $this->warnings).'.');
return false;
- }
+ }
$ps = $this->getPrestashopClient();
$jf = $this->getjirafeClient();
View
22 jirafe/jirafe15.php
@@ -44,7 +44,7 @@ public function __construct()
$this->name = 'jirafe';
$this->tab = 'analytics_stats';
- $this->version = '1.2.2';
+ $this->version = '1.2.3';
//The constructor must be called after the name has been set, but before you try to use any functions like $this->l()
parent::__construct();
@@ -61,15 +61,11 @@ public function __construct()
public function checkConfig()
{
- // Check configurations
- $warnings = array();
if (!in_array(ini_get('allow_url_fopen'), array('On', 'on', '1')))
- $warnings[] = $this->l('allow_url_fopen be enabled on your server to use this module.');
+ $this->warnings[] = $this->l('allow_url_fopen be enabled on your server to use this module.');
if (!is_callable('curl_exec'))
- $warnings[] = $this->l('cURL extension must be enabled on your server to use this module.');
- if (!empty($warnings))
- $this->warning = implode(',<br />', $warnings);
- return (bool)count($warnings);
+ $this->warnings[] = $this->l('cURL extension must be enabled on your server to use this module.');
+ return (bool) (count($this->warnings) ? false : true);
}
public function getPrestashopClient()
@@ -105,15 +101,9 @@ public function getJirafeClient()
public function install()
{
- if ($this->checkConfig() === true)
- {
- echo '<div class="warning">'.Tools::safeOutput($this->warning).'</div>';
- return false;
- }
-
- if (!empty($this->warnings))
+ if ($this->checkConfig() === false)
{
- $this->warning = implode(',<br />', $this->warnings).'.';
+ $this->displayError(implode(',<br />', $this->warnings).'.');
return false;
}
View
20 kiala/config.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<module>
- <name>kiala</name>
- <displayName><![CDATA[Kiala Comprehensive datafile integration &ndash; Kiala contract holders only]]></displayName>
- <version><![CDATA[1.3.2]]></version>
- <description><![CDATA[Offer delivery choice and savings to your customers. Activate the Kiala collection Point delivery option.]]></description>
- <author><![CDATA[PrestaShop]]></author>
- <tab><![CDATA[shipping_logistics]]></tab>
- <is_configurable>1</is_configurable>
- <need_instance>1</need_instance>
+ <module>
+ <name>kiala</name>
+ <displayName><![CDATA[Kiala Comprehensive datafile integration &ndash; Kiala contract holders only]]></displayName>
+ <version><![CDATA[1.3.3]]></version>
+ <description><![CDATA[Offer delivery choice and savings to your customers. Activate the Kiala collection Point delivery option.]]></description>
+ <author><![CDATA[PrestaShop]]></author>
+ <tab><![CDATA[shipping_logistics]]></tab>
+ <is_configurable>1</is_configurable>
+ <need_instance>1</need_instance>
<limited_countries></limited_countries>
-</module>
+ </module>
View
8 kiala/kiala.php
@@ -66,7 +66,7 @@ public function __construct()
$this->name = 'kiala';
$this->author = 'PrestaShop';
$this->tab = 'shipping_logistics';
- $this->version = '1.3.2';
+ $this->version = '1.3.3';
$this->module_key = '9d77262bd27f8a9340855def9c137832';
$this->compatibility_mode = version_compare(_PS_VERSION_, '1.5.0.0', '<');
$this->limited_countries = array('es', 'fr');
@@ -452,10 +452,12 @@ public static function installExternalCarrier($config)
{
if ($language['iso_code'] == 'fr')
$carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
- if ($language['iso_code'] == 'en')
+ elseif ($language['iso_code'] == 'en')
$carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
- if ($language['iso_code'] == 'es')
+ elseif ($language['iso_code'] == 'es')
$carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
+ elseif (!isset($config['delay'][$language['iso_code']]))
+ $carrier->delay[(int)$language['id_lang']] = $config['delay']['en'];
}
if($carrier->add())
View
20 socolissimo/config.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<module>
- <name>socolissimo</name>
- <displayName><![CDATA[So Colissimo]]></displayName>
- <version><![CDATA[2.7.3]]></version>
- <description><![CDATA[Offer your customer 5 different delivery methods with LaPoste.]]></description>
- <author><![CDATA[PrestaShop]]></author>
- <tab><![CDATA[shipping_logistics]]></tab>
- <is_configurable>1</is_configurable>
- <need_instance>1</need_instance>
+ <module>
+ <name>socolissimo</name>
+ <displayName><![CDATA[So Colissimo]]></displayName>
+ <version><![CDATA[2.7.4]]></version>
+ <description><![CDATA[Offer your customer 5 different delivery methods with LaPoste.]]></description>
+ <author><![CDATA[PrestaShop]]></author>
+ <tab><![CDATA[shipping_logistics]]></tab>
+ <is_configurable>1</is_configurable>
+ <need_instance>1</need_instance>
<limited_countries>fr</limited_countries>
-</module>
+ </module>
View
15 socolissimo/socolissimo.php
@@ -60,7 +60,7 @@ function __construct()
{
$this->name = 'socolissimo';
$this->tab = 'shipping_logistics';
- $this->version = '2.7.3';
+ $this->version = '2.7.4';
$this->author = 'PrestaShop';
$this->limited_countries = array('fr');
$this->module_key = 'faa857ecf7579947c8eee2d9b3d1fb04';
@@ -767,11 +767,16 @@ public static function createSoColissimoCarrier($config)
$carrier->need_range = $config['need_range'];
$languages = Language::getLanguages(true);
- foreach ($languages as $language) {
+ foreach ($languages as $language)
+ {
if ($language['iso_code'] == 'fr')
- $carrier->delay[$language['id_lang']] = $config['delay'][$language['iso_code']];
- if ($language['iso_code'] == 'en')
- $carrier->delay[$language['id_lang']] = $config['delay'][$language['iso_code']];
+ $carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
+ elseif ($language['iso_code'] == 'en')
+ $carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
+ elseif ($language['iso_code'] == 'es')
+ $carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
+ elseif (!isset($config['delay'][$language['iso_code']]))
+ $carrier->delay[(int)$language['id_lang']] = $config['delay']['en'];
}
if($carrier->add())
View
20 tntcarrier/config.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<module>
- <name>tntcarrier</name>
- <displayName><![CDATA[TNT Express]]></displayName>
- <version><![CDATA[1.8.3]]></version>
- <description><![CDATA[Offer your customers, different delivery methods with TNT]]></description>
- <author><![CDATA[PrestaShop]]></author>
- <tab><![CDATA[shipping_logistics]]></tab>
- <is_configurable>1</is_configurable>
- <need_instance>1</need_instance>
+ <module>
+ <name>tntcarrier</name>
+ <displayName><![CDATA[TNT Express]]></displayName>
+ <version><![CDATA[1.8.4]]></version>
+ <description><![CDATA[Offer your customers, different delivery methods with TNT]]></description>
+ <author><![CDATA[PrestaShop]]></author>
+ <tab><![CDATA[shipping_logistics]]></tab>
+ <is_configurable>1</is_configurable>
+ <need_instance>1</need_instance>
<limited_countries>fr</limited_countries>
-</module>
+ </module>
View
10 tntcarrier/tntcarrier.php
@@ -27,7 +27,7 @@ public function __construct()
{
$this->name = 'tntcarrier';
$this->tab = 'shipping_logistics';
- $this->version = '1.8.3';
+ $this->version = '1.8.4';
$this->author = 'PrestaShop';
$this->limited_countries = array('fr');
$this->module_key = 'd4dcfde9937b67002235598ac35cbdf8';
@@ -173,12 +173,12 @@ public static function installExternalCarrier($config)
$languages = Language::getLanguages(true);
foreach ($languages as $language)
{
- if ($language['iso_code'] == 'fr')
+ if (($language['iso_code'] == 'fr') || ($language['iso_code'] == 'en'))
$carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
- if ($language['iso_code'] == 'en')
- $carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
- if ($language['iso_code'] == Language::getIsoById(Configuration::get('PS_LANG_DEFAULT')))
+ if ($language['iso_code'] == Language::getIsoById(Configuration::get('PS_LANG_DEFAULT')) && isset($config['delay'][$language['iso_code']]))
$carrier->delay[(int)$language['id_lang']] = $config['delay'][$language['iso_code']];
+ elseif ($language['iso_code'] == Language::getIsoById(Configuration::get('PS_LANG_DEFAULT')) && isset($config['delay']['en']))
+ $carrier->delay[(int)$language['id_lang']] = $config['delay']['en'];
}
if ($carrier->add())
Please sign in to comment.
Something went wrong with that request. Please try again.