diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index e3b792e5e4313574fd1ab3f17ad86afec29fe92b..938143d7c82de5d4c9d13da1f9e23923e4a32de0 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -359,8 +359,8 @@ class Conf } // Format for date - // TODO Mettre les formats dans fichier langue - $this->format_date_short="%d/%m/%Y"; + $this->format_date_short="%d/%m/%Y"; # Format of day with PHP/C tags (strftime functions) + $this->format_date_short_java="dd/MM/yyyy"; # Format of day with Java tags $this->format_hour_short="%H:%M"; $this->format_date_text_short="%d %b %Y"; $this->format_date_text="%d %B %Y"; @@ -368,8 +368,6 @@ class Conf $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) if (! isset($this->global->MAIN_MAX_DECIMALS_UNIT)) $this->global->MAIN_MAX_DECIMALS_UNIT=5; if (! isset($this->global->MAIN_MAX_DECIMALS_TOT)) $this->global->MAIN_MAX_DECIMALS_TOT=2;