-
-
-
-
-
diff --git a/classes/Translate.php b/classes/Translate.php
index 69e5c1d85..cd4ae4214 100644
--- a/classes/Translate.php
+++ b/classes/Translate.php
@@ -51,6 +51,8 @@ class TranslateCore
if ($_LANGADM == null)
{
$iso = Context::getContext()->language->iso_code;
+ if (empty($iso))
+ $iso = Language::getIsoById((int)(Configuration::get('PS_LANG_DEFAULT')));
include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
}
diff --git a/classes/module/Module.php b/classes/module/Module.php
index 73e3c4c35..41a3c9c80 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1164,10 +1164,10 @@ abstract class ModuleCore
$item->active = 0;
if (isset($modaddons->img))
{
- if (!file_exists('../img/tmp/'.md5($modaddons->name).'.jpg'))
- if (!@copy($modaddons->img, '../img/tmp/'.md5($modaddons->name).'.jpg'))
- @copy('../img/404.gif', '../img/tmp/'.md5($modaddons->name).'.jpg');
- if (file_exists('../img/tmp/'.md5($modaddons->name).'.jpg'))
+ if (!file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg'))
+ if (!file_put_contents(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg', Tools::file_get_contents($modaddons->img)))
+ copy(_PS_IMG_DIR_.'404.gif', _PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg');
+ if (file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg'))
$item->image = '../img/tmp/'.md5($modaddons->name).'.jpg';
}
if ($item->type == 'addonsMustHave')
@@ -1178,10 +1178,10 @@ abstract class ModuleCore
foreach ($prices as $currency => $price)
if ($id_currency = Currency::getIdByIsoCode($currency))
{
- $item->price = (float)$price;
- $item->id_currency = (int)$id_currency;
- if ($id_default_currency == $id_currency)
- break;
+ $item->price = (float)$price;
+ $item->id_currency = (int)$id_currency;
+ if ($id_default_currency == $id_currency)
+ break;
}
}
$module_list[] = $item;
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 50c848784..0a1dae094 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -26,7 +26,6 @@
class AdminModulesControllerCore extends AdminController
{
-
/*
** @var array map with $_GET keywords and their callback
*/
diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index 92bc138fd..21517c185 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -5,11 +5,12 @@ return array(
'support' => 'http://support.prestashop.com/en/',
),
'translations' => array(
- 'menu_welcome' => 'Bem-vindo !',
+ 'menu_welcome' => 'Escolha seu idioma',
+ 'menu_license' => 'Acordo de licenciamento',
'menu_system' => 'Compatibilidade do Sistema',
'menu_database' => 'Configuração do Sistema',
- 'menu_configure' => 'Configuração da loja',
- 'menu_process' => 'Instalação',
+ 'menu_configure' => 'Informação da Loja',
+ 'menu_process' => 'Instalação da Loja',
'Choose the installer language:' => 'Escolha a língua para instalação :',
'Field required' => 'Campos requeridos',
'Invalid shop name' => 'Nome da loja inválido',
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index 35172965f..eea0f0ca9 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -4,11 +4,12 @@ return array(
'phone' => '+33 (0)1.40.18.30.04',
),
'translations' => array(
- 'menu_welcome' => 'Willkommen!',
+ 'menu_welcome' => 'Sprachauswahl',
+ 'menu_license' => 'Annahme von Lizenzen',
'menu_system' => 'Systemkompatibilität',
- 'menu_database' => 'Datenbank Konfiguration',
- 'menu_configure' => 'Shop-Konfiguration',
- 'menu_process' => 'Installation',
+ 'menu_database' => ' Systemkonfiguration',
+ 'menu_configure' => 'Shopinstallation',
+ 'menu_process' => 'Installation von Shop',
'Choose the installer language:' => 'Bitte wählen Sie Ihre Sprache',
'Field required' => 'Pflichtfeld',
'Invalid shop name' => 'Ungültiger Shopname',
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index 4c5d33585..8fcbd383f 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -4,11 +4,12 @@ return array(
'phone' => '+1 (888) 947-6543',
),
'translations' => array(
- 'menu_welcome' => '¡Bienvenido!',
- 'menu_system' => 'Compatibilidad sistema',
- 'menu_database' => 'Configuración de base de datos',
- 'menu_configure' => 'Configuración de la tienda',
- 'menu_process' => 'Instalación',
+ 'menu_welcome' => 'Elegir el idioma',
+ 'menu_license' => 'Aceptar las licencias',
+ 'menu_system' => 'Compatibilidad del sistema',
+ 'menu_database' => 'Configuración del sistema',
+ 'menu_configure' => 'Información de la tienda',
+ 'menu_process' => 'Instalación de la tienda',
'Choose the installer language:' => '',
'Field required' => 'Campos requeridos',
'Invalid shop name' => 'Nombre de la tienda no válido',
diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php
index e10bf077d..18e1ef30a 100644
--- a/install-dev/langs/it/install.php
+++ b/install-dev/langs/it/install.php
@@ -4,11 +4,12 @@ return array(
'phone' => '+33 (0)1.40.18.30.04',
),
'translations' => array(
- 'menu_welcome' => 'Benvenuto!',
+ 'menu_welcome' => 'Scelta della lingua',
+ 'menu_license' => 'Accettazione licenze',
'menu_system' => 'Compatibilità sistema',
- 'menu_database' => 'Database',
- 'menu_configure' => 'Configurazione negozio',
- 'menu_process' => 'Installazione',
+ 'menu_database' => 'Configurazione sistema',
+ 'menu_configure' => 'Informazioni negozio',
+ 'menu_process' => 'Installazione del negozio',
'Choose the installer language:' => 'Scegli la lingua di installazione',
'Field required' => 'Campo richiesto',
'Invalid shop name' => 'nome negozio non valido',
diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl
index 6f764f6a5..e9a7a5f94 100644
--- a/themes/live_edit.tpl
+++ b/themes/live_edit.tpl
@@ -28,7 +28,7 @@
{/if}
var lastMove = '';
var saveOK = '{l s='Module position saved' js=1}';
- var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved' js=1}';
+ var confirmClose = "{l s="Are you sure? If you close this window, its position won't be saved" js=1}";
var close = '{l s='Close' js=1}';
var cancel = '{l s='Cancel' js=1}';
var confirm = '{l s='Confirm' js=1}';
-
-
+
{if $add_permission eq '1'}
-
{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}
