mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-07-12 11:55:09 +00:00
Monotone-Parent: 659def76b8868bdc540986987d61b39410737054
Monotone-Revision: 6eed7e248c203a0103250e46033fc47b929ee536 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-02-03T16:12:22 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
+10
-11
@@ -47,17 +47,16 @@
|
||||
#import <NGMime/NGMimeType.h>
|
||||
|
||||
#import <SOGo/SOGoUserDefaults.h>
|
||||
#import <SoObjects/Mailer/SOGoDraftObject.h>
|
||||
#import <SoObjects/Mailer/SOGoMailFolder.h>
|
||||
#import <SoObjects/Mailer/SOGoMailAccount.h>
|
||||
#import <SoObjects/Mailer/SOGoMailAccounts.h>
|
||||
#import <SoObjects/SOGo/SOGoUser.h>
|
||||
#import <SoObjects/SOGo/NSArray+Utilities.h>
|
||||
#import <SoObjects/SOGo/NSDictionary+Utilities.h>
|
||||
#import <Mailer/SOGoDraftObject.h>
|
||||
#import <Mailer/SOGoMailFolder.h>
|
||||
#import <Mailer/SOGoMailAccount.h>
|
||||
#import <Mailer/SOGoMailAccounts.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
#import <SOGo/NSArray+Utilities.h>
|
||||
#import <SOGo/NSDictionary+Utilities.h>
|
||||
#import <SOGo/WOResourceManager+SOGo.h>
|
||||
#import <SOGoUI/UIxComponent.h>
|
||||
|
||||
#import "../../Main/SOGo.h"
|
||||
|
||||
/*
|
||||
UIxMailEditor
|
||||
|
||||
@@ -210,8 +209,8 @@ static NSArray *infoKeys = nil;
|
||||
NSDictionary *locale;
|
||||
|
||||
ud = [[context activeUser] userDefaults];
|
||||
locale = [[WOApplication application]
|
||||
localeForLanguageNamed: [ud language]];
|
||||
locale = [[self resourceManager]
|
||||
localeForLanguageNamed: [ud language]];
|
||||
|
||||
// WARNING : NSLocaleCode is not defined in <Foundation/NSUserDefaults.h>
|
||||
return [locale objectForKey: @"NSLocaleCode"];
|
||||
|
||||
@@ -40,8 +40,8 @@
|
||||
#import <SOGo/SOGoDomainDefaults.h>
|
||||
#import <SOGo/SOGoSystemDefaults.h>
|
||||
#import <SOGo/SOGoUserFolder.h>
|
||||
#import <SOGo/WOResourceManager+SOGo.h>
|
||||
#import <Mailer/SOGoMailAccount.h>
|
||||
#import "../../Main/SOGo.h"
|
||||
|
||||
#import "UIxPreferences.h"
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
category = nil;
|
||||
|
||||
ASSIGN (locale,
|
||||
[[WOApplication application] localeForLanguageNamed: language]);
|
||||
[[self resourceManager] localeForLanguageNamed: language]);
|
||||
ASSIGN (daysOfWeek, [locale objectForKey: NSWeekDayNameArray]);
|
||||
|
||||
dd = [user domainDefaults];
|
||||
|
||||
@@ -35,8 +35,7 @@
|
||||
#import <SOGo/SOGoDateFormatter.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
#import <SOGo/SOGoUserDefaults.h>
|
||||
|
||||
#import "../../Main/SOGo.h"
|
||||
#import <SOGo/WOResourceManager+SOGo.h>
|
||||
|
||||
#import "UIxCalDayTable.h"
|
||||
|
||||
@@ -57,7 +56,7 @@
|
||||
ud = [user userDefaults];
|
||||
ASSIGN (timeFormat, [ud timeFormat]);
|
||||
language = [ud language];
|
||||
locale = [[WOApplication application] localeForLanguageNamed: language];
|
||||
locale = [[self resourceManager] localeForLanguageNamed: language];
|
||||
|
||||
daysToDisplay = nil;
|
||||
hoursToDisplay = nil;
|
||||
|
||||
@@ -30,10 +30,9 @@
|
||||
#import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
|
||||
|
||||
#import <SOGoUI/SOGoAptFormatter.h>
|
||||
#import <SoObjects/SOGo/SOGoUser.h>
|
||||
#import <SoObjects/SOGo/SOGoUserDefaults.h>
|
||||
|
||||
#import "../../Main/SOGo.h"
|
||||
#import <SOGo/SOGoUser.h>
|
||||
#import <SOGo/SOGoUserDefaults.h>
|
||||
#import <SOGo/WOResourceManager+SOGo.h>
|
||||
|
||||
#import "UIxCalMonthView.h"
|
||||
|
||||
@@ -52,7 +51,7 @@
|
||||
// dateFormatter = [[SOGoDateFormatter alloc]
|
||||
// initWithLocale: [self locale]];
|
||||
ud = [[context activeUser] userDefaults];
|
||||
locale = [[WOApplication application] localeForLanguageNamed: [ud language]];
|
||||
locale = [[self resourceManager] localeForLanguageNamed: [ud language]];
|
||||
dayNames = [locale objectForKey: NSWeekDayNameArray];
|
||||
[dayNames retain];
|
||||
monthNames = [locale objectForKey: NSMonthNameArray];
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
#import <SOGo/SOGoUserManager.h>
|
||||
#import <SOGo/SOGoPermissions.h>
|
||||
#import <SOGo/SOGoSystemDefaults.h>
|
||||
#import <SOGo/WOResourceManager+SOGo.h>
|
||||
|
||||
#import "../../Main/SOGo.h"
|
||||
|
||||
@@ -1869,7 +1870,7 @@ RANGE(2);
|
||||
NSDictionary *locale;
|
||||
|
||||
ud = [[context activeUser] userDefaults];
|
||||
locale = [[WOApplication application]
|
||||
locale = [[self resourceManager]
|
||||
localeForLanguageNamed: [ud language]];
|
||||
date = [NSCalendarDate dateWithString: [self range2]
|
||||
calendarFormat: dateFormat
|
||||
|
||||
Reference in New Issue
Block a user