diff --git a/ChangeLog b/ChangeLog index c864c3af1..2635f4b7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-20 Wolfgang Sourdeau + + * 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 * 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],