Monotone-Parent: d083c5462a586e018b7a81654d14c0bfa96479fd

Monotone-Revision: bb98d0952a0fdaba23dd7246fc96ed2798156426

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-20T14:53:49
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-01-20 14:53:49 +00:00
parent 937bd959ed
commit 824810375e
2 changed files with 9 additions and 1 deletions

View File

@ -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

View File

@ -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],