diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index e9ad0836984..8c90382afe8 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -69,14 +69,12 @@ $var=!$var;
print "
| ".$langs->trans("LanguageParameter","PHP LC_ALL")." | ".setlocale(LC_ALL,0)." |
\n";
$var=!$var;
print "| ".$langs->trans("LanguageParameter","PHP LC_NUMERIC")." | ".setlocale(LC_NUMERIC,0)." |
\n";
-$var=!$var;
-print "| ".$langs->trans("LanguageParameter","PHP LC_TIME")." | ".setlocale(LC_TIME,0)." |
\n";
//$var=!$var;
//print "| ".$langs->trans("LanguageParameter","PHP LC_MONETARY")." | ".setlocale(LC_MONETARY,0)." |
\n";
$var=!$var;
print "| => price2num(1234.56) | '.price2num(1233.56+1,'2')." |
";
$var=!$var;
-print "| => dolibarr_print_date(0,"dayhourtext") | '.dolibarr_print_date(0,"dayhourtext")." | ";
+print "
| => dol_print_date(0,"dayhourtext") | '.dol_print_date(0,"dayhourtext")." | ";
// Thousands
$var=!$var;
$thousand=$langs->trans("SeparatorThousand");
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 0a6ed487ad1..d3cfb31f547 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -355,18 +355,18 @@ September=September
October=October
November=November
December=December
-Month01=jan
-Month02=feb
-Month03=mar
-Month04=apr
+Month01=january
+Month02=february
+Month03=march
+Month04=april
Month05=may
-Month06=jun
-Month07=jul
-Month08=aug
-Month09=sep
-Month10=oct
-Month11=nov
-Month12=dec
+Month06=june
+Month07=july
+Month08=august
+Month09=september
+Month10=october
+Month11=november
+Month12=december
MonthShort01=jan
MonthShort02=feb
MonthShort03=mar
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index fa643f7ba94..03ba98e43df 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -380,8 +380,7 @@ function dolibarr_print_date($time,$format='',$to_gmt=false,$outputlangs='')
* "%d/%m/%Y %H:%M:%S",
* "day", "daytext", "dayhour", "dayhourldap", "dayhourtext"
* \param to_gmt false=output string if for local server TZ users, true=output string is for GMT users
- * \param outputlangs Object lang that contains charset_output property to define output
- * This means output is encoded in UTF-8 in default case.
+ * \param outputlangs Object lang that contains language for text translation.
* \return string Formated date or '' if time is null
*/
function dol_print_date($time,$format='',$to_gmt=false,$outputlangs='')
@@ -442,12 +441,6 @@ function dol_print_date($time,$format='',$to_gmt=false,$outputlangs='')
else $ret='Bad value '.$time.' for date';
}
- // What is page code of texts from strftime functions ?
-// $pagecodefrom='ISO-8859-1';
-// $localtime=setlocale(LC_TIME,0);
- //print $localtime;
-// if (eregi('UTF',$localtime)) $pagecodefrom='UTF-8';
-
if (! is_object($outputlangs)) $outputlangs=$langs;
if (eregi('__b__',$format))
@@ -463,7 +456,6 @@ function dol_print_date($time,$format='',$to_gmt=false,$outputlangs='')
//return $ret;
}
-// return $outputlangs->convToOutputCharset($ret,$pagecodefrom);
return $ret;
}
diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php
index 5763868954a..b9c9c9cc0ac 100644
--- a/htdocs/translate.class.php
+++ b/htdocs/translate.class.php
@@ -153,8 +153,6 @@ class Translate {
if (defined("MAIN_FORCE_SETLOCALE_LC_ALL") && MAIN_FORCE_SETLOCALE_LC_ALL)
$res_lc_all=setlocale(LC_ALL, MAIN_FORCE_SETLOCALE_LC_ALL.'.UTF-8', MAIN_FORCE_SETLOCALE_LC_ALL);
- if (defined("MAIN_FORCE_SETLOCALE_LC_TIME") && MAIN_FORCE_SETLOCALE_LC_TIME)
- $res_lc_time=setlocale(LC_TIME, MAIN_FORCE_SETLOCALE_LC_TIME.'.UTF-8', MAIN_FORCE_SETLOCALE_LC_TIME);
if (defined("MAIN_FORCE_SETLOCALE_LC_NUMERIC") && MAIN_FORCE_SETLOCALE_LC_NUMERIC)
$res_lc_numeric=setlocale(LC_NUMERIC, MAIN_FORCE_SETLOCALE_LC_NUMERIC.'.UTF-8', MAIN_FORCE_SETLOCALE_LC_NUMERIC);
if (defined("MAIN_FORCE_SETLOCALE_LC_MONETARY") && MAIN_FORCE_SETLOCALE_LC_MONETARY)
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index b69d5f08b4e..8db8be0130b 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -196,7 +196,6 @@ insert into llx_const (name, value, type, visible) values ('FACTURE_ADDON_PDF',
-- Forcer les locales
--
insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_ALL', '', 'chaine', 1, 'Pour forcer LC_ALL si pb de locale');
-insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_TIME', '', 'chaine', 1, 'Pour forcer LC_TIME si pb de locale');
insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_MONETARY', '', 'chaine', 1, 'Pour forcer LC_MONETARY si pb de locale');
insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_NUMERIC', '', 'chaine', 1, 'Mettre la valeur C si problème de centimes');