From 828d62677ae888f6df94b00a842967d2ef778195 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Oct 2008 20:13:19 +0000 Subject: [PATCH] Text date format is full text --- htdocs/conf/conf.class.php | 6 ++++-- htdocs/lib/functions.lib.php | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 7d2b6fa3271..8ccb1bab6f0 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -457,9 +457,11 @@ class Conf $this->format_date_short="%d/%m/%Y"; $this->format_hour_short="%H:%M"; $this->format_date_text_short="%d %b %Y"; + $this->format_date_text="%d %B %Y"; $this->format_date_hour_short="%d/%m/%Y %H:%M"; - $this->format_date_hour_text_short="%d %B %Y %H:%M"; - + $this->format_date_hour_text_short="%d %b %Y %H:%M"; + $this->format_date_hour_text="%d %B %Y %H:%M"; + $this->format_date_short_java="dd/MM/yyyy"; // Limites decimales si non definie (peuvent etre egale a 0) diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 434f914e9e8..b144918b7d5 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -422,9 +422,12 @@ function dolibarr_print_date($time,$format='',$to_gmt=false) if ($format == 'day') $format=$conf->format_date_short; if ($format == 'hour') $format=$conf->format_hour_short; - if ($format == 'daytext') $format=$conf->format_date_text_short; + if ($format == 'daytext') $format=$conf->format_date_text; + if ($format == 'daytextshort') $format=$conf->format_date_text_short; if ($format == 'dayhour') $format=$conf->format_date_hour_short; - if ($format == 'dayhourtext') $format=$conf->format_date_hour_text_short; + if ($format == 'dayhourtext') $format=$conf->format_date_hour_text; + if ($format == 'dayhourtextshort') $format=$conf->format_date_hour_text_short; + if ($format == 'dayhourlog') $format='%Y%m%d%H%M%S'; if ($format == 'dayhourldap') $format='%Y%m%d%H%M%SZ'; if ($format == 'dayhourxcard') $format='%Y%m%dT%H%M%SZ';