diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php
index c14675438a6..e07f8440e56 100644
--- a/htdocs/lib/datepicker.php
+++ b/htdocs/lib/datepicker.php
@@ -100,6 +100,24 @@ function displayBox($selectedDate,$month,$year){
trans("January"),
+ $langs->trans("February"),
+ $langs->trans("March"),
+ $langs->trans("April"),
+ $langs->trans("May"),
+ $langs->trans("June"),
+ $langs->trans("July"),
+ $langs->trans("August"),
+ $langs->trans("September"),
+ $langs->trans("October"),
+ $langs->trans("November"),
+ $langs->trans("December")
+ );
+
+ print '';
+
while($firstdate["month"]==$mydate["month"])
{
if($mydate["wday"]==0) echo "
";
@@ -116,7 +134,7 @@ function displayBox($selectedDate,$month,$year){
// Sur click dans calendrier, appelle fonction dpClickDay
echo "| format_date_short_java."')\"";
echo ">".sprintf("%02s",$mydate["mday"])." | ";
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 0fefd3a695a..28b95899599 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -2739,5 +2739,42 @@ function make_substitutions($chaine,$substitutionarray)
}
return $chaine;
}
-
+
+/*
+ * \brief Convertit une variable php en variable javascript
+ * \param var variable php
+ * \return result variable javascript
+ */
+ function php2js($var)
+ {
+ if (is_array($var))
+ {
+ $array = array();
+ foreach ($var as $a_var)
+ {
+ $array[] = php2js($a_var);
+ }
+ $result = "[" . join(",", $array) . "]";
+ return $result;
+ }
+ else if (is_bool($var))
+ {
+ $result = $var ? "true" : "false";
+ return $result;
+ }
+ else if (is_int($var) || is_integer($var) || is_double($var) || is_float($var))
+ {
+ $result = $var;
+ return $result;
+ }
+ else if (is_string($var))
+ {
+ $result = "\"" . addslashes(stripslashes($var)) . "\"";
+ return $result;
+ }
+ // autres cas: objets, on ne les gère pas
+ $result = FALSE;
+ return $result;
+}
+
?>
diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js
index 2b727c528c1..366844498c6 100644
--- a/htdocs/lib/lib_head.js
+++ b/htdocs/lib/lib_head.js
@@ -204,21 +204,9 @@ function dpClickDay(year,month,day,format)
closeDPBox();
}
-function dpHighlightDay(year,month,day){
+function dpHighlightDay(year,month,day,tradMonths){
var displayinfo=getObjectFromID("dpExp");
- var months=Array("January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December"
- );
+ var months = tradMonths;
displayinfo.innerHTML=months[month-1]+" "+day+", "+year;
}