diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 784522b3294..32de4e1a7d3 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -106,7 +106,7 @@ if (! $error) { print '
'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$_POST["db_name"]).'
'; print '
'; - if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; + if (empty($db->connected)) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; print $langs->trans("ErrorGoBackAndCorrectParameters"); $error++; } diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php index cbc6ebb3150..c1b943075f8 100644 --- a/htdocs/translate.class.php +++ b/htdocs/translate.class.php @@ -316,7 +316,8 @@ class Translate { } // Clear SeparatorDecimal, SeparatorThousand - if ($this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"]=''; + if (! empty($this->tab_translate["SeparatorDecimal"]) && ! empty($this->tab_translate["SeparatorThousand"]) + && $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"]=''; return 1; }