From 093f567d04d06edc2bfcc18c6f4b301ae7838612 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 26 Oct 2006 17:35:45 +0000
Subject: [PATCH] Monotone-Parent: a07c7ff422e43260171b2ab3e0d2fb3b29663f07
 Monotone-Revision: 7405a4a0cafa826925a9b75bd0084728e46d2dad

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-26T17:35:45
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     | 3 +++
 UI/WebServerResources/UIxAppointmentEditor.js | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd8007529..ef48b8720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/UIxAppointmentEditor.js: correctly handles
+	french and ISO dates.
+
 	* UI/Scheduler/UIxFreeBusyUserSelector.[hm]: added code an ivars
 	from UIxContactSelector to handle contact lists (current and
 	additional contacts).
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index 217ad05cb..954985bfe 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -176,10 +176,15 @@ function saveEvent(sender) {
 }
 
 function _dayAsShortString(node) {
+  var dateStr = '';
   var date = node.value.split("/");
-  if (date.length != 3)
+  if (date.length == 3)
+    dateStr += date[2] + date[1] + date[0];
+  else {
     date = node.value.split("-");
-  return date[2] + date[1] + date[0];
+    dateStr += date[0] + date[1] + date[2];
+  }
+  return dateStr;
 }
 
 function startDayAsShortString() {