Fix for feature #3079

Monotone-Parent: 1de4349e78aa0e2e7b5b5f1107576ae89d90f64e
Monotone-Revision: 56b6e4ca9c570a4e36d00e32127d539e82da7293

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-11-05T17:26:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-11-05 17:26:02 +00:00
parent d54abbdcfe
commit 5100d6611d
14 changed files with 221 additions and 5 deletions
+16
View File
@@ -6,3 +6,19 @@
"Password:" = "Wachtwoord:";
"Connect" = "Inloggen";
"Wrong username or password." = "Wrong username or password.";
"cookiesNotEnabled" = "You cannot login because your browser's cookies are disabled. Please enable cookies in your browser's settings and try again.";
"browserNotCompatible" = "We've detected that your browser version is currently not supported on this site. Our recommendation is to use Firefox. Click on the link bellow to download the most current version of this browser.";
"alternativeBrowsers" = "Alternatively, you can also use the following compatible browsers";
"alternativeBrowserSafari" = "Alternatively, you can also use Safari.";
"Download" = "Download";
"Language:" = "Language:";
"choose" = "Choose ...";
"English" = "English";
"French" = "French";
"German" = "German";
"Italian" = "Italian";
"Spanish" = "Spanish";
@@ -14,3 +14,11 @@
"alternativeBrowsers" = "Alternatively, you can also use the following compatible browsers";
"alternativeBrowserSafari" = "Alternatively, you can also use Safari.";
"Download" = "Download";
"Language:" = "Language:";
"choose" = "Choose ...";
"English" = "English";
"French" = "French";
"German" = "German";
"Italian" = "Italian";
"Spanish" = "Spanish";
@@ -14,3 +14,11 @@
"alternativeBrowsers" = "Comme alternative, vous pouvez aussi utiliser les navigateurs suivants:";
"alternativeBrowserSafari" = "Comme alternative, vous pouvez aussi utiliser Safari.";
"Download" = "Télécharger";
"Language:" = "Langue:";
"choose" = "Choisir ...";
"English" = "Anglais";
"French" = "Français";
"German" = "Allemand";
"Italian" = "Italien";
"Spanish" = "Espagnol";
@@ -6,3 +6,19 @@
"Password:" = "Passwort:";
"Connect" = "Verbinden";
"Wrong username or password." = "Wrong username or password.";
"cookiesNotEnabled" = "You cannot login because your browser's cookies are disabled. Please enable cookies in your browser's settings and try again.";
"browserNotCompatible" = "We've detected that your browser version is currently not supported on this site. Our recommendation is to use Firefox. Click on the link bellow to download the most current version of this browser.";
"alternativeBrowsers" = "Alternatively, you can also use the following compatible browsers";
"alternativeBrowserSafari" = "Alternatively, you can also use Safari.";
"Download" = "Download";
"Language:" = "Language:";
"choose" = "Choose ...";
"English" = "English";
"French" = "French";
"German" = "German";
"Italian" = "Italian";
"Spanish" = "Spanish";
@@ -13,3 +13,11 @@
"alternativeBrowsers" = "Alternativamente, puoi utilizzare questi browser compatibili";
"alternativeBrowserSafari" = "Alternativamente, puoi utilizzare Safari.";
"Download" = "Scarica";
"Language:" = "Language:";
"choose" = "Choose ...";
"English" = "English";
"French" = "French";
"German" = "German";
"Italian" = "Italian";
"Spanish" = "Spanish";
+3
View File
@@ -26,6 +26,9 @@
#import <UI/SOGoUI/UIxComponent.h>
@interface SOGoRootPage : UIxComponent
{
id item;
}
@end
+48 -1
View File
@@ -38,6 +38,8 @@
#import "SOGoRootPage.h"
static NSArray *supportedLanguages = nil;
@interface SOGoRootPage (crashAdditions)
- (void) segfault;
@@ -46,6 +48,12 @@
@implementation SOGoRootPage
+ (void) initialize
{
if (!supportedLanguages)
supportedLanguages = [NSArray arrayWithObjects: @"English", @"French", @"German", @"Italian", @"Spanish", nil];
}
/* accessors */
- (NSString *) connectURL
@@ -60,14 +68,16 @@
WORequest *request;
WOCookie *authCookie;
SOGoWebAuthenticator *auth;
SOGoUser *user;
NSString *cookieValue, *cookieString;
NSString *userName, *password;
NSString *userName, *password, *language;
auth = [[WOApplication application]
authenticatorInContext: context];
request = [context request];
userName = [request formValueForKey: @"userName"];
password = [request formValueForKey: @"password"];
language = [request formValueForKey: @"language"];
if ([auth checkLogin: userName password: password])
{
[self logWithFormat: @"successful login for user '%@'", userName];
@@ -80,6 +90,13 @@
value: cookieValue];
[authCookie setPath: @"/"];
[response addCookie: authCookie];
if (language)
{
user = [SOGoUser userWithLogin: userName roles: nil];
[[user userDefaults] setObject: language forKey: @"Language"];
[[user userDefaults] synchronize];
}
}
else
{
@@ -151,4 +168,34 @@
return ([[self loginSuffix] length]);
}
- (void) setItem: (id) _item
{
ASSIGN (item, _item);
}
- (id) item
{
return item;
}
- (NSArray *) languages
{
return supportedLanguages;
}
- (NSString *) language
{
return [SOGoUser language];
}
- (NSString *) languageText
{
NSString *text;
text = [self labelForKey: item];
return text;
}
@end /* SOGoRootPage */
@@ -16,3 +16,11 @@
"alternativeBrowsers" = "Alternativamente, también puede usar uno se los siguientes navegadores compatibles: ";
"alternativeBrowserSafari" = "Alternativamente, puede usar Safari.";
"Download" = "Descarga";
"Language:" = "Language:";
"choose" = "Choose ...";
"English" = "English";
"French" = "French";
"German" = "German";
"Italian" = "Italian";
"Spanish" = "Spanish";