See ChangeLog.
Monotone-Parent: b3af4618e267496536ae158c684a391e497913f0 Monotone-Revision: 85f004835cf5ba09158bc317c859435dd12fe5bf Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-03-30T15:21:27 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
c0560681dd
commit
f630dd1c83
|
@ -13,6 +13,12 @@
|
||||||
(-fetchFreeBusyInfosFrom:to:): we must fetch the c_content in
|
(-fetchFreeBusyInfosFrom:to:): we must fetch the c_content in
|
||||||
order to flatten cyclic events.
|
order to flatten cyclic events.
|
||||||
|
|
||||||
|
* SoObjects/SOGo/SOGoSystemDefaults.m (-pageTitle): new method to
|
||||||
|
retrieve the Web page title from the new system defaults "SOGoPageTitle".
|
||||||
|
|
||||||
|
* UI/Common/UIxPageFrame.m (-title): consider the new system
|
||||||
|
default attribute "SOGoPageTitle".
|
||||||
|
|
||||||
2011-03-29 Francis Lachapelle <flachapelle@inverse.ca>
|
2011-03-29 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/Appointments/iCalEvent+SOGo.m
|
* SoObjects/Appointments/iCalEvent+SOGo.m
|
||||||
|
|
|
@ -58,6 +58,7 @@
|
||||||
- (BOOL) uixAdditionalPreferences;
|
- (BOOL) uixAdditionalPreferences;
|
||||||
|
|
||||||
- (BOOL) uixDebugEnabled;
|
- (BOOL) uixDebugEnabled;
|
||||||
|
- (NSString *) pageTitle;
|
||||||
|
|
||||||
- (NSArray *) supportedLanguages;
|
- (NSArray *) supportedLanguages;
|
||||||
- (NSString *) loginSuffix;
|
- (NSString *) loginSuffix;
|
||||||
|
|
|
@ -271,6 +271,11 @@ BootstrapNSUserDefaults ()
|
||||||
return [self boolForKey: @"SOGoUIxDebugEnabled"];
|
return [self boolForKey: @"SOGoUIxDebugEnabled"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSString *) pageTitle
|
||||||
|
{
|
||||||
|
return [self stringForKey: @"SOGoPageTitle"];
|
||||||
|
}
|
||||||
|
|
||||||
- (NSArray *) supportedLanguages
|
- (NSArray *) supportedLanguages
|
||||||
{
|
{
|
||||||
return [self stringArrayForKey: @"SOGoSupportedLanguages"];
|
return [self stringArrayForKey: @"SOGoSupportedLanguages"];
|
||||||
|
|
|
@ -78,10 +78,20 @@
|
||||||
|
|
||||||
- (NSString *) title
|
- (NSString *) title
|
||||||
{
|
{
|
||||||
if ([self isUIxDebugEnabled])
|
NSString *pageTitle;
|
||||||
return title;
|
SOGoSystemDefaults *sd;
|
||||||
|
|
||||||
return [self labelForKey: @"SOGo"];
|
if ([self isUIxDebugEnabled])
|
||||||
|
pageTitle = title;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sd = [SOGoSystemDefaults sharedSystemDefaults];
|
||||||
|
pageTitle = [sd pageTitle];
|
||||||
|
if (pageTitle == nil || ![pageTitle length])
|
||||||
|
pageTitle = [self labelForKey: @"SOGo"];
|
||||||
|
}
|
||||||
|
|
||||||
|
return pageTitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) setItem: (id) _item
|
- (void) setItem: (id) _item
|
||||||
|
|
Loading…
Reference in New Issue