From 8961f1077a8ff51941f0d7d1b7363b9d30a6469a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Jul 2016 12:19:58 +0200
Subject: [PATCH] Detection of chrome to install correctly doliwamp when chrome
is used
---
build/exe/doliwamp/Languages/MyCatalan.isl | 3 ++-
build/exe/doliwamp/Languages/MyEnglish.isl | 1 +
build/exe/doliwamp/Languages/MyFrench.isl | 1 +
build/exe/doliwamp/Languages/MySpanish.isl | 3 ++-
build/exe/doliwamp/doliwamp.iss | 22 +++++++++++++++++++---
5 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/build/exe/doliwamp/Languages/MyCatalan.isl b/build/exe/doliwamp/Languages/MyCatalan.isl
index a78042e795b..d8b86eae5ba 100644
--- a/build/exe/doliwamp/Languages/MyCatalan.isl
+++ b/build/exe/doliwamp/Languages/MyCatalan.isl
@@ -20,7 +20,7 @@ DoYouWantToStart=Vol iniciar el proc
TechnicalParameters=Par�metres t�cnics
IfFirstInstall=Si es tracta de la primera instal laci�, haur� d'especificar alguns par�metres t�cnics. Si no els ent�n, no sabeu o va a procedir a una actualitzaci�, deixi els camps amb els valors proposats per defecte.
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
SMTPServer=Servidor SMTP (El seu o el del seu ISP, �nicament primera instal.laci�) :
ApachePort=Puerto Apache (�nicament primera instal.laci�, normalment �s el 80) :
MySqlPort=Puerto Mysql (�nicament primera instal.laci�, normalment �s el 3306) :
@@ -31,6 +31,7 @@ FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminaci
PortAlreadyInUse=Sembla que el port %1 ja est� sent utilitzat. Es recomana cancel�lar, tornar enrere i especificar un altre valor per al port% 2. Cancel�lar i escollir un altre valor?
FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
+ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no est� segur, simplement feu clic a Obrir:
LaunchNow=Llan�ar ara Dolibarr
diff --git a/build/exe/doliwamp/Languages/MyEnglish.isl b/build/exe/doliwamp/Languages/MyEnglish.isl
index ed85010db1b..6e70f3c12f3 100644
--- a/build/exe/doliwamp/Languages/MyEnglish.isl
+++ b/build/exe/doliwamp/Languages/MyEnglish.isl
@@ -31,6 +31,7 @@ FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You c
PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?
FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
+ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
LaunchNow=Launch Dolibarr now
diff --git a/build/exe/doliwamp/Languages/MyFrench.isl b/build/exe/doliwamp/Languages/MyFrench.isl
index 6c1b859a318..1daf4425e68 100644
--- a/build/exe/doliwamp/Languages/MyFrench.isl
+++ b/build/exe/doliwamp/Languages/MyFrench.isl
@@ -32,6 +32,7 @@ FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lo
PortAlreadyInUse=Le port %1 semble d�j� utilis�. Il est recommand� d'annuler pour revenir en arri�re et sp�cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
FirefoxDetected=Firefox a �t� d�tect� sur votre ordinateur. Voulez-vous en faire votre navigateur par d�faut pour Dolibarr ?
+ChromeDetected=Chrome a �t� d�tect� sur votre ordinateur. Voulez-vous en faire votre navigateur par d�faut pour Dolibarr ?
ChooseDefaultBrowser=Merci de choisir votre navigateur par d�faut. Si vous n'�tes pas s�r, cliquez simplement sur Ouvrir :
LaunchNow=Lancer Dolibarr maintenant
diff --git a/build/exe/doliwamp/Languages/MySpanish.isl b/build/exe/doliwamp/Languages/MySpanish.isl
index 24a0c981e09..63c0136f351 100644
--- a/build/exe/doliwamp/Languages/MySpanish.isl
+++ b/build/exe/doliwamp/Languages/MySpanish.isl
@@ -20,7 +20,7 @@ DoYouWantToStart=
TechnicalParameters=Par�metros t�cnicos
IfFirstInstall=Si se trata de la primera instalaci�n, deber� especificar algunos par�metros t�cnicos. Si no los entiende, no est� seguro o va a proceder a una actualizaci�n, deje los campos con los valores propuestos por defecto.
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
SMTPServer=Servidor SMTP (El suyo o el de su ISP, �nicamente primera instalaci�n) :
ApachePort=Puerto Apache (�nicamente primera instalaci�n, normalmente es el 80) :
MySqlPort=Puerto Mysql (�nicamente primera instalaci�n, normalmente es el 3306) :
@@ -31,6 +31,7 @@ FailedToDeleteLock=Error en la eliminaci
PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. �Cancelar y escojer otro valor?
FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
+ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
ChooseDefaultBrowser=Escoja su navegador por defecto. Si no est� seguro, simplementa haga clic en Abrir :
LaunchNow=Lanzar ahora Dolibarr
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 8a65f65fbf3..242f7ac30ef 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -540,13 +540,29 @@ begin
begin
//navigateur
browser := 'iexplore.exe';
- if FileExists (pfPath+'/Mozilla Firefox/firefox.exe') then
+
+ if browser = 'iexplore.exe' then
begin
- if MsgBox(CustomMessage('FirefoxDetected'),mbConfirmation,MB_YESNO) = IDYES then
+ if FileExists (pfPath+'/Google/Chrome/Application/chrome.exe') then
begin
- browser := pfPath+'/Mozilla Firefox/firefox.exe';
+ if MsgBox(CustomMessage('ChromeDetected'),mbConfirmation,MB_YESNO) = IDYES then
+ begin
+ browser := pfPath+'/Google/Chrome/Application/chrome.exe';
+ end;
end;
end;
+
+ if browser = 'iexplore.exe' then
+ begin
+ if FileExists (pfPath+'/Mozilla Firefox/firefox.exe') then
+ begin
+ if MsgBox(CustomMessage('FirefoxDetected'),mbConfirmation,MB_YESNO) = IDYES then
+ begin
+ browser := pfPath+'/Mozilla Firefox/firefox.exe';
+ end;
+ end;
+ end;
+
if browser = 'iexplore.exe' then
begin
if FileExists (pfPath+'/Internet Explorer/iexplore.exe') then
--
GitLab