Monotone-Parent: d083c5462a586e018b7a81654d14c0bfa96479fd
Monotone-Revision: bb98d0952a0fdaba23dd7246fc96ed2798156426 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-20T14:53:49 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
937bd959ed
commit
824810375e
|
@ -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>
|
2010-01-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/Appointments/SOGoAppointmentFolders.m
|
* SoObjects/Appointments/SOGoAppointmentFolders.m
|
||||||
|
|
|
@ -311,10 +311,12 @@
|
||||||
- (NSString *) itemTimeFormatText
|
- (NSString *) itemTimeFormatText
|
||||||
{
|
{
|
||||||
NSString *todayText, *timeFormatText;
|
NSString *todayText, *timeFormatText;
|
||||||
|
SOGoDomainDefaults *dd;
|
||||||
|
|
||||||
if ([item isEqualToString: @"default"])
|
if ([item isEqualToString: @"default"])
|
||||||
{
|
{
|
||||||
todayText = [today descriptionWithCalendarFormat: [locale objectForKey: NSTimeFormatString]
|
dd = [user domainDefaults];
|
||||||
|
todayText = [today descriptionWithCalendarFormat: [dd timeFormat]
|
||||||
locale: locale];
|
locale: locale];
|
||||||
timeFormatText = [NSString stringWithFormat: @"%@ (%@)",
|
timeFormatText = [NSString stringWithFormat: @"%@ (%@)",
|
||||||
[self labelForKey: item],
|
[self labelForKey: item],
|
||||||
|
|
Loading…
Reference in a new issue