From 824810375eddc6b121f61d7d1b8e16030af4de7f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 20 Jan 2010 14:53:49 +0000
Subject: [PATCH] Monotone-Parent: d083c5462a586e018b7a81654d14c0bfa96479fd
 Monotone-Revision: bb98d0952a0fdaba23dd7246fc96ed2798156426

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-20T14:53:49
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                         | 6 ++++++
 UI/PreferencesUI/UIxPreferences.m | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c864c3af1..2635f4b7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/PreferencesUI/UIxPreferences.m (-itemTimeFormatTexts): the
+	default time format is not taken from the domain defaults rather
+	than the user locale.
+
 2010-01-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolders.m
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index c70b677de..db129102e 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -311,10 +311,12 @@
 - (NSString *) itemTimeFormatText
 {
   NSString *todayText, *timeFormatText;
+  SOGoDomainDefaults *dd;
 
   if ([item isEqualToString: @"default"])
     {
-      todayText = [today descriptionWithCalendarFormat: [locale objectForKey: NSTimeFormatString]
+      dd = [user domainDefaults];
+      todayText = [today descriptionWithCalendarFormat: [dd timeFormat]
                                                 locale: locale];
       timeFormatText = [NSString stringWithFormat: @"%@ (%@)",
                                 [self labelForKey: item],