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

// Merge -> revision 9288

Browse Source
This commit is contained in:
rMalie
2011-10-12 16:04:28 +00:00
parent a6f2eb5639
commit a07c14fafd
32 changed files with 1529 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/index.php
+8
View File
@@ -992,6 +992,9 @@ if ($lm->getIncludeTradFilename())
<td id="endEmail" class="resultEnd">&nbsp;</td>
</tr>
</table>
<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder.'); ?></h3>
<div id="boBlock" class="blockInfoEnd clearfix">
<img src="img/visu_boBlock.png" />
<h3><?php echo lang('Back Office'); ?></h3>
@@ -1323,6 +1326,11 @@ if ($lm->getIncludeTradFilename())
}
?>
<div class="infosBlock">
<?php echo lang('WARNING: For more security, you must delete the \'install\' folder.'); ?>
</div>
<div id="foBlock" class="blockInfoEnd clearfix">
<img src="img/visu_foBlock.png" />
<h3><?php echo lang('Front Office'); ?></h3>
install-dev/langs/de.php
+1
View File
@@ -140,6 +140,7 @@ $_LANG['Update is complete!'] = 'Aktualisierung beendet!';
$_LANG['Upgrade: get the latest stable version!'] = 'Aktualisierung: Installieren Sie die neueste Version von PrestaShop';
$_LANG['Verify now!'] = 'Testen der SQL-Verbindung';
$_LANG['Verify system compatibility'] = 'Systemkompatibilität';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern';
$_LANG['Welcome'] = 'Willkommen';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Willkommen bei der Installation von PrestaShop %s';
install-dev/langs/es.php
+1
View File
@@ -138,6 +138,7 @@ $_LANG['Update is complete!'] = '¬°Actualización completa!';
$_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestaShop';
$_LANG['Verify now!'] = '¬°Pruebe ahora!';
$_LANG['Verify system compatibility'] = 'Compatibilidad sistema';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¬°Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
$_LANG['Welcome'] = 'Bienvenido';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
install-dev/langs/fr.php
+1
View File
@@ -141,6 +141,7 @@ $_LANG['Update is complete!'] = 'Mise à jour terminée !';
$_LANG['Upgrade: get the latest stable version!'] = 'Mise à jour : installez la dernière version de PrestaShop';
$_LANG['Verify now!'] = 'Tester la connexion';
$_LANG['Verify system compatibility'] = 'Compatibilité système';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle';
$_LANG['Welcome'] = 'Bienvenue';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
install-dev/langs/it.php
+1
View File
@@ -140,6 +140,7 @@ $_LANG['Update is complete!'] = 'Aggiornamento terminato!';
$_LANG['Upgrade: get the latest stable version!'] = 'Aggiornamento installa l\'ultima versione di PrestaShop';
$_LANG['Verify now!'] = 'Prova la connessione SQL';
$_LANG['Verify system compatibility'] = 'Compatibilità sistema';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.';
$_LANG['Welcome'] = 'Benvenuto';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Benvenuto nell\'installazione di PrestaShop %s';
install-dev/langs/us.php
+1
View File
@@ -64,6 +64,7 @@ $_LANG['This is not a valid image file.'] = 'Invalid image file';
$_LANG['Too long!'] = 'Too long';
$_LANG['Upgrade: get the latest stable version!'] = 'Update: Get the latest stable version';
$_LANG['Verify system compatibility'] = 'System Compatibility';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'WARNING: For more security, you must delete the \'install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'WARNING! A manual backup is HIGHLY recommended before continuing.';
$_LANG['Welcome'] = 'Welcome!';
$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Welcome to the PrestaShop™ v'.INSTALL_VERSION.' Installer wizard.';
install-dev/model.php
+4 -4
View File
@@ -48,8 +48,8 @@ if (file_exists(INSTALL_PATH.'/../config/settings.inc.php'))
// setting the memory limit to 128M only if current is lower
$memory_limit = ini_get('memory_limit');
if ( substr($memory_limit,-1) != 'G'
AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128)
if ( substr($memory_limit,-1) != 'G'
AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128)
OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072))
){
@ini_set('memory_limit','128M');
@@ -108,9 +108,9 @@ if (isset($_GET['method']))
case 'doUpgrade' :
require_once('xml/doUpgrade.php');
break;
case 'getVersionFromDb' :
require_once('xml/getVersionFromDb.php');
break;
}
}
}