lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix translation during install

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-27 01:53:36 +02:00
parent f292c1c662
commit a076d4b461
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/install/inc.php
View File

@ -172,6 +172,12 @@ if (! empty($dolibarr_main_document_root_alt))
// Security check (old method, when directory is renamed /install.lock) // Security check (old method, when directory is renamed /install.lock)
if (preg_match('/install\.lock/i',$_SERVER["SCRIPT_FILENAME"])) if (preg_match('/install\.lock/i',$_SERVER["SCRIPT_FILENAME"]))
{ {
if (! is_object($langs))
{
$langs = new Translate('..');
$langs->setDefaultLang('auto');
}
$langs->load("install");
print $langs->trans("YouTryInstallDisabledByDirLock"); print $langs->trans("YouTryInstallDisabledByDirLock");
if (! empty($dolibarr_main_url_root)) if (! empty($dolibarr_main_url_root))
{ {
@ -190,6 +196,12 @@ if (constant('DOL_DATA_ROOT') === null) {
} }
if (@file_exists($lockfile)) if (@file_exists($lockfile))
{ {
if (! is_object($langs))
{
$langs = new Translate('..');
$langs->setDefaultLang('auto');
}
$langs->load("install");
print $langs->trans("YouTryInstallDisabledByFileLock"); print $langs->trans("YouTryInstallDisabledByFileLock");
if (! empty($dolibarr_main_url_root)) if (! empty($dolibarr_main_url_root))
{ {