amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-27 04:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix for bug #3097

Browse Source 
Monotone-Parent: 30278078dfd012e96e074c87b01c0c3a5fab2bbc
Monotone-Revision: 4aebe8e414a3fcd8c8f09db947a8221f926ab5cd

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-12-23T00:12:14
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-12-23 00:12:14 +00:00
parent b47c7216fd
commit 07e108baf5
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/PreferencesUI/UIxPreferences.m
+13 -5
View File
@@ -65,16 +65,20 @@ static BOOL shouldDisplayAdditionalPreferences = NO;
- (id) init
{
NSDictionary *locale;
//NSDictionary *locale;
NSString *language;
if ((self = [super init]))
{
language = [[context activeUser] language];
item = nil;
hours = nil;
ASSIGN (user, [context activeUser]);
ASSIGN (userDefaults, [user userDefaults]);
ASSIGN (today, [NSCalendarDate date]);
locale = [context valueForKey: @"locale"];
//locale = [context valueForKey: @"locale"];
ASSIGN (locale, [[WOApplication application] localeForLanguageNamed: language]);
ASSIGN (daysOfWeek,
[locale objectForKey: NSWeekDayNameArray]);
hasChanged = NO;
@@ -91,6 +95,7 @@ static BOOL shouldDisplayAdditionalPreferences = NO;
[userDefaults release];
[hours release];
[daysOfWeek release];
[locale release];
[super dealloc];
}
@@ -185,7 +190,8 @@ static BOOL shouldDisplayAdditionalPreferences = NO;
- (NSString *) itemShortDateFormatText
{
return [today descriptionWithCalendarFormat: item
locale: [context valueForKey: @"locale"]];
locale: locale];
//locale: [context valueForKey: @"locale"]];
}
- (NSString *) userShortDateFormat
@@ -228,7 +234,8 @@ static BOOL shouldDisplayAdditionalPreferences = NO;
- (NSString *) itemLongDateFormatText
{
return [today descriptionWithCalendarFormat: item
locale: [context valueForKey: @"locale"]];
locale: locale];
//locale: [context valueForKey: @"locale"]];
}
- (NSString *) userLongDateFormat
@@ -271,7 +278,8 @@ static BOOL shouldDisplayAdditionalPreferences = NO;
- (NSString *) itemTimeFormatText
{
return [today descriptionWithCalendarFormat: item
locale: [context valueForKey: @"locale"]];
locale: locale];
//locale: [context valueForKey: @"locale"]];
}
- (NSString *) userTimeFormat