From bf4b183bfb1300ec97a31bd65521b194ac594d36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 26 Oct 2009 01:22:40 +0000
Subject: [PATCH] Fix: Errors in postgreSQL support
---
htdocs/install/etape5.php | 2 +-
htdocs/langs/en_US/admin.lang | 2 +-
htdocs/langs/fr_FR/admin.lang | 1 +
htdocs/lib/databases/pgsql.lib.php | 4 ++--
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 93636c61b1d..11e572e268c 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -179,7 +179,7 @@ if ($_POST["action"] == "set" || preg_match('/upgrade/i',$_POST["action"]))
else
{
dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
- print '<br>'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'<br><br>';
+ print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
}
}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 793dc8d94d0..a76735adc72 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -722,7 +722,7 @@ RestoreDesc3=* Restore the data, from a backup dump file, into the database of t
ForcedToByAModule = This rule is forced to <b>%s</b> by an activated module
PreviousDumpFiles=Available database backup dump files
WeekStartOnDay=First day of week
-
+RunningUpdateProcessMayBeRequired=Le lancement du processus de mise a jour semble requis (La version des programme %s differe de la version de la base %s)
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index d09802b84a0..39aab1be46a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -722,6 +722,7 @@ RestoreDesc3 = * Recharger depuis le fichier dump sauvegardé, la base de donné
ForcedToByAModule = Cette règle est forcée à <b>%s</b> par un des modules activés
PreviousDumpFiles=Fichiers disponibles de sauvegarde de la base de donnée
WeekStartOnDay=Premier jour de la semaine
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s)
##### Module password generation = undefined
PasswordGenerationStandard = Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés.
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index 0037bbc4210..f4286116663 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -603,7 +603,7 @@ class DoliDb
*/
function idate($param)
{
- return adodb_strftime("%Y%m%d%H%M%S",$param);
+ return "'".adodb_strftime("%Y-%m-%d %H:%M:%S",$param)."'";
}
/**
@@ -968,7 +968,7 @@ class DoliDb
*/
function getDefaultCollationDatabase()
{
- $resql=$this->query('SHOW SERVER_ENCODING');
+ $resql=$this->query('SHOW LC_COLLATE');
$liste=$this->fetch_array($resql);
return $liste['lc_collate'];
}
--
GitLab