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

Fix missing translation

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-24 15:44:13 +02:00
parent 2649c136cf
commit 3615b7b45d
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/install/inc.php
View File

@ -172,12 +172,11 @@ 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"]))
{ {
print 'Install pages have been disabled for security reason (directory renamed with .lock suffix).'; print $langs->trans("YouTryInstallDisabledByDirLock");
if (! empty($dolibarr_main_url_root)) if (! empty($dolibarr_main_url_root))
{ {
print 'Click on following link. '; print 'Click on following link, <a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">'; print $langs->trans("ClickHereToGoToApp");
print 'Click here to go to Dolibarr';
print '</a>'; print '</a>';
} }
exit; exit;
@ -191,13 +190,12 @@ if (constant('DOL_DATA_ROOT') === null) {
} }
if (@file_exists($lockfile)) if (@file_exists($lockfile))
{ {
print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr documents directory).<br>'; print $langs->trans("YouTryInstallDisabledByFileLock");
if (! empty($dolibarr_main_url_root)) if (! empty($dolibarr_main_url_root))
{ {
print 'Click on following link. '; print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
print 'If you always reach this page, you must remove install.lock file manually.<br>';
print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">'; print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
print 'Click here to go to Dolibarr'; print $langs->trans("ClickHereToGoToApp");
print '</a>'; print '</a>';
} }
else else
@ -370,6 +368,7 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$css
global $langs; global $langs;
$langs->load("main"); $langs->load("main");
$langs->load("admin"); $langs->load("admin");
$langs->load("install");
$jquerytheme='base'; $jquerytheme='base';

4
htdocs/langs/en_US/install.lang
View File

@ -204,3 +204,7 @@ MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
ShowNotAvailableOptions=Show not available options ShowNotAvailableOptions=Show not available options
HideNotAvailableOptions=Hide not available options HideNotAvailableOptions=Hide not available options
ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed. ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
ClickHereToGoToApp=Click here to go to your application
ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually