From 3615b7b45d3fe36af6cb47627fd2091becf58137 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 Jun 2018 15:44:13 +0200
Subject: [PATCH] Fix missing translation

---
 htdocs/install/inc.php          | 15 +++++++--------
 htdocs/langs/en_US/install.lang |  4 ++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 7c2895eb835..f51254620af 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -172,12 +172,11 @@ if (! empty($dolibarr_main_document_root_alt))
 // Security check (old method, when directory is renamed /install.lock)
 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))
     {
-        print 'Click on following link. ';
-        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 '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 $langs->trans("ClickHereToGoToApp");
         print '</a>';
     }
     exit;
@@ -191,13 +190,12 @@ if (constant('DOL_DATA_ROOT') === null) {
 }
 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))
     {
-        print 'Click on following link. ';
-        print 'If you always reach this page, you must remove install.lock file manually.<br>';
+        print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
         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>';
     }
     else
@@ -370,6 +368,7 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$css
     global $langs;
     $langs->load("main");
     $langs->load("admin");
+	$langs->load("install");
 
     $jquerytheme='base';
 
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index acdddfe3f59..00d4be864ff 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -204,3 +204,7 @@ MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show 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.
+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
\ No newline at end of file