diff --git a/UI/Common/BrazilianPortuguese.lproj/Localizable.strings b/UI/Common/BrazilianPortuguese.lproj/Localizable.strings index 03960106f..c2079131f 100644 --- a/UI/Common/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Common/BrazilianPortuguese.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Inicio:"; "Due Date:" = "Data:"; "Location:" = "Localização:"; + +"a2_Sunday" = "Do"; +"a2_Monday" = "Se"; +"a2_Tuesday" = "Te"; +"a2_Wednesday" = "Qu"; +"a2_Thursday" = "Qu"; +"a2_Friday" = "Se"; +"a2_Saturday" = "Sa"; diff --git a/UI/Common/Catalan.lproj/Localizable.strings b/UI/Common/Catalan.lproj/Localizable.strings index 90282b94c..faf27fb07 100644 --- a/UI/Common/Catalan.lproj/Localizable.strings +++ b/UI/Common/Catalan.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Inici:"; "Due Date:" = "Data límit:"; "Location:" = "Lloc:"; + +"a2_Sunday" = "dg"; +"a2_Monday" = "dl"; +"a2_Tuesday" = "dm"; +"a2_Wednesday" = "dc"; +"a2_Thursday" = "dj"; +"a2_Friday" = "dv"; +"a2_Saturday" = "ds"; diff --git a/UI/Common/Czech.lproj/Localizable.strings b/UI/Common/Czech.lproj/Localizable.strings index 7177907e3..9cd3a9dcd 100644 --- a/UI/Common/Czech.lproj/Localizable.strings +++ b/UI/Common/Czech.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Začátek:"; "Due Date:" = "Do dne:"; "Location:" = "Místo:"; + +"a2_Sunday" = "Ne"; +"a2_Monday" = "Po"; +"a2_Tuesday" = "Út"; +"a2_Wednesday" = "St"; +"a2_Thursday" = "Čt"; +"a2_Friday" = "Pá"; +"a2_Saturday" = "So"; diff --git a/UI/Common/Danish.lproj/Localizable.strings b/UI/Common/Danish.lproj/Localizable.strings index ae1e83ffc..4d202bb81 100644 --- a/UI/Common/Danish.lproj/Localizable.strings +++ b/UI/Common/Danish.lproj/Localizable.strings @@ -77,3 +77,11 @@ "Start:" = "Start:"; "Due Date:" = "Forfaldsdato:"; "Location:" = "Sted:"; + +"a2_Sunday" = "Sø"; +"a2_Monday" = "Ma"; +"a2_Tuesday" = "Ti"; +"a2_Wednesday" = "On"; +"a2_Thursday" = "To"; +"a2_Friday" = "Fr"; +"a2_Saturday" = "Lø"; diff --git a/UI/Common/Dutch.lproj/Localizable.strings b/UI/Common/Dutch.lproj/Localizable.strings index e7e93caf0..074e51f6a 100644 --- a/UI/Common/Dutch.lproj/Localizable.strings +++ b/UI/Common/Dutch.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Begin:"; "Due Date:" = "Verloopdatum:"; "Location:" = "Plaats:"; + +"a2_Sunday" = "Zo"; +"a2_Monday" = "Ma"; +"a2_Tuesday" = "Di"; +"a2_Wednesday" = "Wo"; +"a2_Thursday" = "Do"; +"a2_Friday" = "Vr"; +"a2_Saturday" = "Za"; diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings index a7a57bb09..5fcd24853 100644 --- a/UI/Common/English.lproj/Localizable.strings +++ b/UI/Common/English.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Start:"; "Due Date:" = "Due Date:"; "Location:" = "Location:"; + +"a2_Sunday" = "Su"; +"a2_Monday" = "Mo"; +"a2_Tuesday" = "Tu"; +"a2_Wednesday" = "We"; +"a2_Thursday" = "Th"; +"a2_Friday" = "Fr"; +"a2_Saturday" = "Sa"; diff --git a/UI/Common/French.lproj/Localizable.strings b/UI/Common/French.lproj/Localizable.strings index 66f6ea1b6..0b55ef391 100644 --- a/UI/Common/French.lproj/Localizable.strings +++ b/UI/Common/French.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Début :"; "Due Date:" = "Échéance :"; "Location:" = "Lieu :"; + +"a2_Sunday" = "Di"; +"a2_Monday" = "Lu"; +"a2_Tuesday" = "Ma"; +"a2_Wednesday" = "Me"; +"a2_Thursday" = "Je"; +"a2_Friday" = "Ve"; +"a2_Saturday" = "Sa"; diff --git a/UI/Common/German.lproj/Localizable.strings b/UI/Common/German.lproj/Localizable.strings index 86be7e020..077c49b19 100644 --- a/UI/Common/German.lproj/Localizable.strings +++ b/UI/Common/German.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Beginn:"; "Due Date:" = "Fällig:"; "Location:" = "Ort:"; + +"a2_Sunday" = "So"; +"a2_Monday" = "Mo"; +"a2_Tuesday" = "Di"; +"a2_Wednesday" = "Mi"; +"a2_Thursday" = "Do"; +"a2_Friday" = "Fr"; +"a2_Saturday" = "Sa"; diff --git a/UI/Common/Hungarian.lproj/Localizable.strings b/UI/Common/Hungarian.lproj/Localizable.strings index 5a9048dda..f2215a84e 100644 --- a/UI/Common/Hungarian.lproj/Localizable.strings +++ b/UI/Common/Hungarian.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Kezdés:"; "Due Date:" = "Lejárat dátuma:"; "Location:" = "Hely:"; + +"a2_Sunday" = "Va"; +"a2_Monday" = "Hé"; +"a2_Tuesday" = "Ke"; +"a2_Wednesday" = "Sz"; +"a2_Thursday" = "Cs"; +"a2_Friday" = "Pé"; +"a2_Saturday" = "Sz"; diff --git a/UI/Common/Icelandic.lproj/Localizable.strings b/UI/Common/Icelandic.lproj/Localizable.strings index 77d5f632f..5ff813858 100644 --- a/UI/Common/Icelandic.lproj/Localizable.strings +++ b/UI/Common/Icelandic.lproj/Localizable.strings @@ -77,3 +77,11 @@ "Start:" = "Byrjun:"; "Due Date:" = "Lokadagur:"; "Location:" = "Staðsetning:"; + +"a2_Sunday" = "Su"; +"a2_Monday" = "Má"; +"a2_Tuesday" = "Þr"; +"a2_Wednesday" = "Mi"; +"a2_Thursday" = "Fi"; +"a2_Friday" = "Fö"; +"a2_Saturday" = "La"; diff --git a/UI/Common/Italian.lproj/Localizable.strings b/UI/Common/Italian.lproj/Localizable.strings index f5fd4efa7..65844b366 100644 --- a/UI/Common/Italian.lproj/Localizable.strings +++ b/UI/Common/Italian.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Inizio:"; "Due Date:" = "Scadenza:"; "Location:" = "Luogo:"; + +"a2_Sunday" = "Do"; +"a2_Monday" = "Lu"; +"a2_Tuesday" = "Ma"; +"a2_Wednesday" = "Me"; +"a2_Thursday" = "Gi"; +"a2_Friday" = "Ve"; +"a2_Saturday" = "Sab"; diff --git a/UI/Common/NorwegianBokmal.lproj/Localizable.strings b/UI/Common/NorwegianBokmal.lproj/Localizable.strings index 416c1ea7d..71c96b922 100644 --- a/UI/Common/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/Common/NorwegianBokmal.lproj/Localizable.strings @@ -93,3 +93,11 @@ "Start:" = "Start:"; "Due Date:" = "Forfallsdato:"; "Location:" = "Lokasjon:"; + +"a2_Sunday" = "Sø"; +"a2_Monday" = "Ma"; +"a2_Tuesday" = "Ti"; +"a2_Wednesday" = "On"; +"a2_Thursday" = "To"; +"a2_Friday" = "Fr"; +"a2_Saturday" = "Lø"; diff --git a/UI/Common/NorwegianNynorsk.lproj/Localizable.strings b/UI/Common/NorwegianNynorsk.lproj/Localizable.strings index 6d83d29cf..57d63bc74 100644 --- a/UI/Common/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/Common/NorwegianNynorsk.lproj/Localizable.strings @@ -77,3 +77,11 @@ "Start:" = "Start:"; "Due Date:" = "Forfallsdato:"; "Location:" = "Lokasjon:"; + +"a2_Sunday" = "Sø"; +"a2_Monday" = "Ma"; +"a2_Tuesday" = "Ti"; +"a2_Wednesday" = "On"; +"a2_Thursday" = "To"; +"a2_Friday" = "Fr"; +"a2_Saturday" = "Lø"; diff --git a/UI/Common/Polish.lproj/Localizable.strings b/UI/Common/Polish.lproj/Localizable.strings index f0960082a..8754bd63b 100644 --- a/UI/Common/Polish.lproj/Localizable.strings +++ b/UI/Common/Polish.lproj/Localizable.strings @@ -77,3 +77,11 @@ "Start:" = "Początek:"; "Due Date:" = "Termin:"; "Location:" = "Miejsce:"; + +"a2_Sunday" = "Ni"; +"a2_Monday" = "Pn"; +"a2_Tuesday" = "Wt"; +"a2_Wednesday" = "Śr"; +"a2_Thursday" = "Cz"; +"a2_Friday" = "Pi"; +"a2_Saturday" = "So"; diff --git a/UI/Common/Russian.lproj/Localizable.strings b/UI/Common/Russian.lproj/Localizable.strings index 84fd2b00c..180f6bdc8 100644 --- a/UI/Common/Russian.lproj/Localizable.strings +++ b/UI/Common/Russian.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Начало:"; "Due Date:" = "Дата начала:"; "Location:" = "Место:"; + +"a2_Sunday" = "Вс"; +"a2_Monday" = "Пн"; +"a2_Tuesday" = "Вт"; +"a2_Wednesday" = "Ср"; +"a2_Thursday" = "Чт"; +"a2_Friday" = "Пт"; +"a2_Saturday" = "Сб"; diff --git a/UI/Common/SpanishArgentina.lproj/Localizable.strings b/UI/Common/SpanishArgentina.lproj/Localizable.strings index 839f123ab..50d0c9d20 100644 --- a/UI/Common/SpanishArgentina.lproj/Localizable.strings +++ b/UI/Common/SpanishArgentina.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Desde:"; "Due Date:" = "Vencimiento:"; "Location:" = "Lugar:"; + +"a2_Sunday" = "Do"; +"a2_Monday" = "Lu"; +"a2_Tuesday" = "Ma"; +"a2_Wednesday" = "Mi"; +"a2_Thursday" = "Ju"; +"a2_Friday" = "Vi"; +"a2_Saturday" = "Sá"; diff --git a/UI/Common/SpanishSpain.lproj/Localizable.strings b/UI/Common/SpanishSpain.lproj/Localizable.strings index 5d64ea4f9..87b993c7e 100644 --- a/UI/Common/SpanishSpain.lproj/Localizable.strings +++ b/UI/Common/SpanishSpain.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Desde:"; "Due Date:" = "Vencimiento:"; "Location:" = "Lugar:"; + +"a2_Sunday" = "Do"; +"a2_Monday" = "Lu"; +"a2_Tuesday" = "Ma"; +"a2_Wednesday" = "Mi"; +"a2_Thursday" = "Ju"; +"a2_Friday" = "Vi"; +"a2_Saturday" = "Sá"; diff --git a/UI/Common/Swedish.lproj/Localizable.strings b/UI/Common/Swedish.lproj/Localizable.strings index 36533fed7..8afdd9fc2 100644 --- a/UI/Common/Swedish.lproj/Localizable.strings +++ b/UI/Common/Swedish.lproj/Localizable.strings @@ -77,3 +77,11 @@ "Start:" = "Start:"; "Due Date:" = "Förfallodag:"; "Location:" = "Plats:"; + +"a2_Sunday" = "Sö"; +"a2_Monday" = "Må"; +"a2_Tuesday" = "Ti"; +"a2_Wednesday" = "On"; +"a2_Thursday" = "To"; +"a2_Friday" = "Fr"; +"a2_Saturday" = "Lö"; diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index 0b3282e47..60d9bca41 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -24,6 +24,7 @@ #import #import #import +#import /* for locale strings */ #import @@ -210,9 +211,11 @@ - (NSString *) _stringsForFramework: (NSString *) framework { NSString *language, *frameworkName; + NSMutableDictionary* strings; SOGoUserDefaults *ud; id table; + // When no framework is specified, we load the strings from UI/Common frameworkName = [NSString stringWithFormat: @"%@.SOGo", (framework ? framework : [self frameworkName])]; ud = [[context activeUser] userDefaults]; @@ -225,8 +228,26 @@ inFramework: frameworkName languages: [NSArray arrayWithObject: language]]; + strings = [NSMutableDictionary dictionaryWithDictionary: table]; + + if (!framework) + { + // Add strings from Locale + NSDictionary *moreStrings; + + // Month names + moreStrings = [NSDictionary dictionaryWithObjects: [locale objectForKey: NSMonthNameArray] + forKeys: [UIxComponent monthLabelKeys]]; + [strings addEntriesFromDictionary: moreStrings]; + + // Short month names + moreStrings = [NSDictionary dictionaryWithObjects: [locale objectForKey: NSShortMonthNameArray] + forKeys: [UIxComponent abbrMonthLabelKeys]]; + [strings addEntriesFromDictionary: moreStrings]; + } + /* table is not really an NSDictionary but a hackish variation thereof */ - return [[NSDictionary dictionaryWithDictionary: table] jsonRepresentation]; + return [strings jsonRepresentation]; } - (NSString *) commonLocalizableStrings diff --git a/UI/Common/Ukrainian.lproj/Localizable.strings b/UI/Common/Ukrainian.lproj/Localizable.strings index 743c717c7..3b3d596a1 100644 --- a/UI/Common/Ukrainian.lproj/Localizable.strings +++ b/UI/Common/Ukrainian.lproj/Localizable.strings @@ -99,3 +99,11 @@ "Start:" = "Початок:"; "Due Date:" = "Дата початку:"; "Location:" = "Місце:"; + +"a2_Sunday" = "Нд"; +"a2_Monday" = "Пн"; +"a2_Tuesday" = "Вт"; +"a2_Wednesday" = "Ср"; +"a2_Thursday" = "Чт"; +"a2_Friday" = "Пт"; +"a2_Saturday" = "Сб"; diff --git a/UI/Common/Welsh.lproj/Localizable.strings b/UI/Common/Welsh.lproj/Localizable.strings index 1dc5cdc63..0933a7918 100644 --- a/UI/Common/Welsh.lproj/Localizable.strings +++ b/UI/Common/Welsh.lproj/Localizable.strings @@ -77,3 +77,11 @@ "Start:" = "Dechrau:"; "Due Date:" = "Dyddiad dyledus:"; "Location:" = "Lleoliad:"; + +"a2_Sunday" = "Su"; +"a2_Monday" = "Ll"; +"a2_Tuesday" = "Ma"; +"a2_Wednesday" = "Me"; +"a2_Thursday" = "Ia"; +"a2_Friday" = "Gw"; +"a2_Saturday" = "Sa"; diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h index cedb0263a..24a1ea43a 100644 --- a/UI/PreferencesUI/UIxPreferences.h +++ b/UI/PreferencesUI/UIxPreferences.h @@ -26,7 +26,6 @@ #import @class NSString; -@class SOGoUserDefaults; @class SOGoUser; @@ -34,13 +33,11 @@ { id item; SOGoUser *user; - NSDictionary *locale; NSString *category; NSArray *calendarCategories; NSDictionary *calendarCategoriesColors; NSArray *contactsCategories; NSString *defaultCategoryColor; - SOGoUserDefaults *userDefaults; NSCalendarDate *today; NSArray *daysOfWeek, *daysBetweenResponsesList; NSArray *sieveFilters; diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index a772fbb40..465311ff8 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -70,9 +70,7 @@ item = nil; #warning user should be the owner rather than the activeUser ASSIGN (user, [context activeUser]); - ASSIGN (userDefaults, [user userDefaults]); ASSIGN (today, [NSCalendarDate date]); - //locale = [context valueForKey: @"locale"]; language = [userDefaults language]; calendarCategories = nil; @@ -80,8 +78,6 @@ defaultCategoryColor = nil; category = nil; - ASSIGN (locale, - [[self resourceManager] localeForLanguageNamed: language]); ASSIGN (daysOfWeek, [locale objectForKey: NSWeekDayNameArray]); dd = [user domainDefaults]; @@ -119,7 +115,6 @@ [today release]; [item release]; [user release]; - [userDefaults release]; [sieveFilters release]; [vacationOptions release]; [calendarCategories release]; @@ -129,7 +124,6 @@ [contactsCategories release]; [forwardOptions release]; [daysOfWeek release]; - [locale release]; [super dealloc]; } diff --git a/UI/SOGoUI/UIxComponent.h b/UI/SOGoUI/UIxComponent.h index c343773f2..7e66fdf47 100644 --- a/UI/SOGoUI/UIxComponent.h +++ b/UI/SOGoUI/UIxComponent.h @@ -35,14 +35,19 @@ TODO: document facilities. */ -@class NSCalendarDate, NSTimeZone, NSMutableDictionary, SoUser; +@class NSCalendarDate, NSTimeZone, NSMutableDictionary, SoUser, SOGoUserDefaults; @interface UIxComponent : SoComponent { NSMutableDictionary *queryParameters; NSCalendarDate *_selectedDate; + NSDictionary *locale; + SOGoUserDefaults *userDefaults; } ++ (NSArray *) monthLabelKeys; ++ (NSArray *) abbrMonthLabelKeys; + - (NSString *)queryParameterForKey:(NSString *)_key; - (NSDictionary *)queryParameters; @@ -80,6 +85,9 @@ /* labels */ - (NSString *) labelForKey:(NSString *)_key; +- (NSString *) commonLabelForKey:(NSString *)_key; +- (NSString *) labelForKey: (NSString *) _str + withResourceManager: (WOResourceManager *) _rm; - (NSString *) localizedNameForDayOfWeek:(unsigned)_dayOfWeek; - (NSString *) localizedAbbreviatedNameForDayOfWeek:(unsigned)_dayOfWeek; diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index e57f10256..d443da766 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2011 Inverse inc. + Copyright (C) 2007-2012 Inverse inc. Copyright (C) 2004 SKYRIX Software AG This file is part of SOGo @@ -25,10 +25,12 @@ #import #import #import +#import /* for locale strings */ #import #import #import +#import #import #import #import @@ -63,6 +65,7 @@ static NSMutableArray *dayLabelKeys = nil; static NSMutableArray *abbrDayLabelKeys = nil; static NSMutableArray *monthLabelKeys = nil; static NSMutableArray *abbrMonthLabelKeys = nil; +static SoProduct *commonProduct = nil; + (int)version { return [super version] + 0 /* v2 */; @@ -107,27 +110,51 @@ static NSMutableArray *abbrMonthLabelKeys = nil; [monthLabelKeys addObject:@"December"]; abbrMonthLabelKeys = [[NSMutableArray alloc] initWithCapacity:12]; - [abbrMonthLabelKeys addObject:@"a3_January"]; - [abbrMonthLabelKeys addObject:@"a3_February"]; - [abbrMonthLabelKeys addObject:@"a3_March"]; - [abbrMonthLabelKeys addObject:@"a3_April"]; - [abbrMonthLabelKeys addObject:@"a3_May"]; - [abbrMonthLabelKeys addObject:@"a3_June"]; - [abbrMonthLabelKeys addObject:@"a3_July"]; - [abbrMonthLabelKeys addObject:@"a3_August"]; - [abbrMonthLabelKeys addObject:@"a3_September"]; - [abbrMonthLabelKeys addObject:@"a3_October"]; - [abbrMonthLabelKeys addObject:@"a3_November"]; - [abbrMonthLabelKeys addObject:@"a3_December"]; + [abbrMonthLabelKeys addObject:@"Jan"]; + [abbrMonthLabelKeys addObject:@"Feb"]; + [abbrMonthLabelKeys addObject:@"Mar"]; + [abbrMonthLabelKeys addObject:@"Apr"]; + [abbrMonthLabelKeys addObject:@"May"]; + [abbrMonthLabelKeys addObject:@"Jun"]; + [abbrMonthLabelKeys addObject:@"Jul"]; + [abbrMonthLabelKeys addObject:@"Aug"]; + [abbrMonthLabelKeys addObject:@"Sep"]; + [abbrMonthLabelKeys addObject:@"Oct"]; + [abbrMonthLabelKeys addObject:@"Nov"]; + [abbrMonthLabelKeys addObject:@"Dec"]; + + // @see commonLabelForKey: + commonProduct = [[SoProduct alloc] initWithBundle: + [NSBundle bundleForClass: NSClassFromString(@"CommonUIProduct")]]; } } ++ (NSArray *) abbrDayLabelKeys +{ + return (NSArray *) abbrDayLabelKeys; +} + ++ (NSArray *) monthLabelKeys +{ + return (NSArray *) monthLabelKeys; +} + ++ (NSArray *) abbrMonthLabelKeys +{ + return (NSArray *) abbrMonthLabelKeys; +} + - (id) init { + NSString *language; + if ((self = [super init])) { _selectedDate = nil; queryParameters = nil; + ASSIGN (userDefaults, [[context activeUser] userDefaults]); + language = [userDefaults language]; + ASSIGN (locale, [[self resourceManager] localeForLanguageNamed: language]); } return self; @@ -137,6 +164,8 @@ static NSMutableArray *abbrMonthLabelKeys = nil; { [queryParameters release]; [_selectedDate release]; + [locale release]; + [userDefaults release]; [super dealloc]; } @@ -393,16 +422,13 @@ static NSMutableArray *abbrMonthLabelKeys = nil; - (NSCalendarDate *) selectedDate { - SOGoUserDefaults *ud; - if (!_selectedDate) { - ud = [[context activeUser] userDefaults]; _selectedDate = [NSCalendarDate dateFromShortDateString: [self queryParameterForKey: @"day"] andShortTimeString: [self queryParameterForKey: @"hm"] - inTimeZone: [ud timeZone]]; + inTimeZone: [userDefaults timeZone]]; [_selectedDate retain]; } @@ -411,10 +437,7 @@ static NSMutableArray *abbrMonthLabelKeys = nil; - (NSString *) dateStringForDate: (NSCalendarDate *) _date { - SOGoUserDefaults *ud; - - ud = [[context activeUser] userDefaults]; - [_date setTimeZone: [ud timeZone]]; + [_date setTimeZone: [userDefaults timeZone]]; return [_date descriptionWithCalendarFormat: @"%Y%m%d"]; } @@ -495,24 +518,39 @@ static NSMutableArray *abbrMonthLabelKeys = nil; - (NSString *) labelForKey: (NSString *) _str { WOResourceManager *rm; + /* find resource manager */ + + rm = [self pageResourceManager]; + + return [self labelForKey: _str withResourceManager: rm]; +} + +- (NSString *) commonLabelForKey: (NSString *) _str +{ + WOResourceManager *rm; + + rm = [commonProduct resourceManager]; + + return [self labelForKey: _str withResourceManager: rm]; +} + +- (NSString *) labelForKey: (NSString *) _str + withResourceManager: (WOResourceManager *) rm +{ NSArray *languages; NSString *lKey, *lTable, *lVal; NSRange r; if ([_str length] == 0) return nil; - - /* lookup languages */ - - languages = [context resourceLookupLanguages]; - - /* find resource manager */ - - if ((rm = [self pageResourceManager]) == nil) - rm = [[WOApplication application] resourceManager]; + if (rm == nil) [self warnWithFormat:@"missing resource manager!"]; - + + /* lookup languages */ + + languages = [context resourceLookupLanguages]; + /* get parameters */ r = [_str rangeOfString:@"/"]; @@ -541,22 +579,25 @@ static NSMutableArray *abbrMonthLabelKeys = nil; - (NSString *) localizedNameForDayOfWeek: (unsigned) dayOfWeek { - return [self labelForKey: [dayLabelKeys objectAtIndex: dayOfWeek % 7]]; + return [[locale objectForKey: NSWeekDayNameArray] objectAtIndex: dayOfWeek % 7]; } - (NSString *) localizedAbbreviatedNameForDayOfWeek: (unsigned) dayOfWeek { - return [self labelForKey: [abbrDayLabelKeys objectAtIndex: dayOfWeek % 7]]; + // Defined in Common bundle + return [self commonLabelForKey: [abbrDayLabelKeys objectAtIndex: dayOfWeek % 7]]; } - (NSString *) localizedNameForMonthOfYear: (unsigned) monthOfYear { - return [self labelForKey: [monthLabelKeys objectAtIndex: (monthOfYear - 1) % 12]]; + // Defined in Locale + return [[locale objectForKey: NSMonthNameArray] objectAtIndex: (monthOfYear - 1) % 12]; } - (NSString *) localizedAbbreviatedNameForMonthOfYear: (unsigned) monthOfYear { - return [self labelForKey: [abbrMonthLabelKeys objectAtIndex: (monthOfYear - 1) % 12]]; + // Defined in Locale + return [[locale objectForKey: NSShortMonthNameArray] objectAtIndex: (monthOfYear - 1) % 12]; } /* HTTP method safety */ diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings index 083a5fcd3..5dd13807f 100644 --- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Domingo"; -"Monday" = "Segunda"; -"Tuesday" = "Terça"; -"Wednesday" = "Quarta"; -"Thursday" = "Quinta"; -"Friday" = "Sexta"; -"Saturday" = "Sábado"; "DayOfTheMonth" = "Dia do mês"; - -"Sun" = "Dom"; -"Mon" = "Seg"; -"Tue" = "Ter"; -"Wed" = "Qua"; -"Thu" = "Qui"; -"Fri" = "Sex"; -"Sat" = "Sab"; - -"a2_Sunday" = "Do"; -"a2_Monday" = "Se"; -"a2_Tuesday" = "Te"; -"a2_Wednesday" = "Qu"; -"a2_Thursday" = "Qu"; -"a2_Friday" = "Se"; -"a2_Saturday" = "Sa"; - "dayLabelFormat" = "%m/%d/%Y"; "today" = "Hoje"; @@ -63,32 +39,6 @@ "this month" = "este mês"; -"January" = "Janeiro"; -"February" = "Fevereiro"; -"March" = "Março"; -"April" = "Abril"; -"May" = "Maio"; -"June" = "Junho"; -"July" = "Julho"; -"August" = "Agosto"; -"September" = "Setembro"; -"October" = "Outubro"; -"November" = "Novembro"; -"December" = "Dezembro"; - -"a3_January" = "Janeiro"; -"a3_February" = "Fevereiro"; -"a3_March" = "Março"; -"a3_April" = "Abril"; -"a3_May" = "Maio"; -"a3_June" = "Junho"; -"a3_July" = "Julho"; -"a3_August" = "Agosto"; -"a3_September" = "Setembro"; -"a3_October" = "Outubro"; -"a3_November" = "Novembro"; -"a3_December" = "Dezembro"; - "Previous Month" = "Mês Anterior"; "Next Month" = "Próximo Mês"; diff --git a/UI/Scheduler/Catalan.lproj/Localizable.strings b/UI/Scheduler/Catalan.lproj/Localizable.strings index 196252c4b..49394470d 100644 --- a/UI/Scheduler/Catalan.lproj/Localizable.strings +++ b/UI/Scheduler/Catalan.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Diumenge"; -"Monday" = "Dilluns"; -"Tuesday" = "Dimarts"; -"Wednesday" = "Dimecres"; -"Thursday" = "Dijous"; -"Friday" = "Divendres"; -"Saturday" = "Dissabte"; "DayOfTheMonth" = "Dia del mes"; - -"Sun" = "dg"; -"Mon" = "dl"; -"Tue" = "dm"; -"Wed" = "dc"; -"Thu" = "dj"; -"Fri" = "dv"; -"Sat" = "ds"; - -"a2_Sunday" = "dg"; -"a2_Monday" = "dl"; -"a2_Tuesday" = "dm"; -"a2_Wednesday" = "dc"; -"a2_Thursday" = "dj"; -"a2_Friday" = "dv"; -"a2_Saturday" = "ds"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Avui"; @@ -63,32 +39,6 @@ "this month" = "Aquest mes"; -"January" = "gener"; -"February" = "febrer"; -"March" = "març"; -"April" = "abril"; -"May" = "maig"; -"June" = "juny"; -"July" = "juliol"; -"August" = "agost"; -"September" = "setembre"; -"October" = "octubre"; -"November" = "novembre"; -"December" = "desembre"; - -"a3_January" = "gener"; -"a3_February" = "febrer"; -"a3_March" = "març"; -"a3_April" = "abril"; -"a3_May" = "maig"; -"a3_June" = "juny"; -"a3_July" = "juliol"; -"a3_August" = "agost"; -"a3_September" = "setembre"; -"a3_October" = "octubre"; -"a3_November" = "novembre"; -"a3_December" = "desembre"; - "Previous Month" = "Mes anterior"; "Next Month" = "Mes següent"; diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings index 7bf5301c3..db8447806 100644 --- a/UI/Scheduler/Czech.lproj/Localizable.strings +++ b/UI/Scheduler/Czech.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Neděle"; -"Monday" = "Pondělí"; -"Tuesday" = "Úterý"; -"Wednesday" = "Středa"; -"Thursday" = "Čtvrtek"; -"Friday" = "Pátek"; -"Saturday" = "Sobota"; "DayOfTheMonth" = "DayOfTheMonth"; - -"Sun" = "Ne"; -"Mon" = "Po"; -"Tue" = "Út"; -"Wed" = "St"; -"Thu" = "čt"; -"Fri" = "Pá"; -"Sat" = "So"; - -"a2_Sunday" = "Ne"; -"a2_Monday" = "Po"; -"a2_Tuesday" = "Út"; -"a2_Wednesday" = "St"; -"a2_Thursday" = "Čt"; -"a2_Friday" = "Pá"; -"a2_Saturday" = "So"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Dnes"; @@ -63,32 +39,6 @@ "this month" = "tento měsíc"; -"January" = "Leden"; -"February" = "Únor"; -"March" = "Březen"; -"April" = "Duben"; -"May" = "Květen"; -"June" = "Červen"; -"July" = "Červenec"; -"August" = "Srpen"; -"September" = "Září"; -"October" = "Říjen"; -"November" = "Listopad"; -"December" = "Prosinec"; - -"a3_January" = "Leden"; -"a3_February" = "Únor"; -"a3_March" = "Březen"; -"a3_April" = "Duben"; -"a3_May" = "Květen"; -"a3_June" = "Červen"; -"a3_July" = "Červenec"; -"a3_August" = "Srpen"; -"a3_September" = "Září"; -"a3_October" = "Říjen"; -"a3_November" = "Listopad"; -"a3_December" = "Prosinec"; - "Previous Month" = "Předchozí měsíc"; "Next Month" = "Následující měsíc"; diff --git a/UI/Scheduler/Danish.lproj/Localizable.strings b/UI/Scheduler/Danish.lproj/Localizable.strings index b95f3235b..997f6ecf0 100644 --- a/UI/Scheduler/Danish.lproj/Localizable.strings +++ b/UI/Scheduler/Danish.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Søndag"; -"Monday" = "Mandag"; -"Tuesday" = "Tirsdag"; -"Wednesday" = "Onsdag"; -"Thursday" = "Torsdag"; -"Friday" = "Fredag"; -"Saturday" = "Lørdag"; "DayOfTheMonth" = "Dag i måneden"; - -"Sun" = "Søn"; -"Mon" = "Man"; -"Tue" = "Tir"; -"Wed" = "Ons"; -"Thu" = "Tor"; -"Fri" = "Fre"; -"Sat" = "Lør"; - -"a2_Sunday" = "Sø"; -"a2_Monday" = "Ma"; -"a2_Tuesday" = "Ti"; -"a2_Wednesday" = "On"; -"a2_Thursday" = "To"; -"a2_Friday" = "Fr"; -"a2_Saturday" = "Lø"; - "dayLabelFormat" = "%m/%d/%Y"; "today" = "I dag"; @@ -63,32 +39,6 @@ "this month" = "Denne måned"; -"January" = "Januar"; -"February" = "Februar"; -"March" = "Marts"; -"April" = "April"; -"May" = "Maj"; -"June" = "Juni"; -"July" = "Juli"; -"August" = "August"; -"September" = "September"; -"October" = "Oktober"; -"November" = "November"; -"December" = "December"; - -"a3_January" = "Januar"; -"a3_February" = "Februar"; -"a3_March" = "Marts"; -"a3_April" = "April"; -"a3_May" = "Maj"; -"a3_June" = "Juni"; -"a3_July" = "Juli"; -"a3_August" = "August"; -"a3_September" = "September"; -"a3_October" = "Oktober"; -"a3_November" = "November"; -"a3_December" = "December"; - "Previous Month" = "Forrige måned"; "Next Month" = "Næste måned"; diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings index 26a6fffb2..52584c767 100644 --- a/UI/Scheduler/Dutch.lproj/Localizable.strings +++ b/UI/Scheduler/Dutch.lproj/Localizable.strings @@ -17,31 +17,7 @@ /* Day */ -"Sunday" = "Zondag"; -"Monday" = "Maandag"; -"Tuesday" = "Dinsdag"; -"Wednesday" = "Woensdag"; -"Thursday" = "Donderdag"; -"Friday" = "Vrijdag"; -"Saturday" = "Zaterdag"; "DayOfTheMonth" = "Dag van de maand"; - -"Sun" = "Zo"; -"Mon" = "Ma"; -"Tue" = "Di"; -"Wed" = "Wo"; -"Thu" = "Do"; -"Fri" = "Vr"; -"Sat" = "Za"; - -"a2_Sunday" = "Zo"; -"a2_Monday" = "Ma"; -"a2_Tuesday" = "Di"; -"a2_Wednesday" = "Wo"; -"a2_Thursday" = "Do"; -"a2_Friday" = "Vr"; -"a2_Saturday" = "Za"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "vandaag"; @@ -62,32 +38,6 @@ "this month" = "deze maand"; -"January" = "Januari"; -"February" = "Februari"; -"March" = "Maart"; -"April" = "April"; -"May" = "Mei"; -"June" = "Juni"; -"July" = "Juli"; -"August" = "Augustus"; -"September" = "September"; -"October" = "Oktober"; -"November" = "November"; -"December" = "December"; - -"a3_January" = "Jan"; -"a3_February" = "Feb"; -"a3_March" = "Maa"; -"a3_April" = "Apr"; -"a3_May" = "Mei"; -"a3_June" = "Jun"; -"a3_July" = "Jul"; -"a3_August" = "Aug"; -"a3_September" = "Sep"; -"a3_October" = "Okt"; -"a3_November" = "Nov"; -"a3_December" = "Dec"; - "Previous Month" = "Vorige maand"; "Next Month" = "Volgende maand"; diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 19d33077e..47651fc49 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Sunday"; -"Monday" = "Monday"; -"Tuesday" = "Tuesday"; -"Wednesday" = "Wednesday"; -"Thursday" = "Thursday"; -"Friday" = "Friday"; -"Saturday" = "Saturday"; "DayOfTheMonth" = "Day of the month"; - -"Sun" = "Sun"; -"Mon" = "Mon"; -"Tue" = "Tue"; -"Wed" = "Wed"; -"Thu" = "Thu"; -"Fri" = "Fri"; -"Sat" = "Sat"; - -"a2_Sunday" = "Su"; -"a2_Monday" = "Mo"; -"a2_Tuesday" = "Tu"; -"a2_Wednesday" = "We"; -"a2_Thursday" = "Th"; -"a2_Friday" = "Fr"; -"a2_Saturday" = "Sa"; - "dayLabelFormat" = "%m/%d/%Y"; "today" = "Today"; @@ -63,32 +39,6 @@ "this month" = "this month"; -"January" = "January"; -"February" = "February"; -"March" = "March"; -"April" = "April"; -"May" = "May"; -"June" = "June"; -"July" = "July"; -"August" = "August"; -"September" = "September"; -"October" = "October"; -"November" = "November"; -"December" = "December"; - -"a3_January" = "January"; -"a3_February" = "February"; -"a3_March" = "March"; -"a3_April" = "April"; -"a3_May" = "May"; -"a3_June" = "June"; -"a3_July" = "July"; -"a3_August" = "August"; -"a3_September" = "September"; -"a3_October" = "October"; -"a3_November" = "November"; -"a3_December" = "December"; - "Previous Month" = "Previous Month"; "Next Month" = "Next Month"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 8ae970b37..15a5d3339 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Dimanche"; -"Monday" = "Lundi"; -"Tuesday" = "Mardi"; -"Wednesday" = "Mercredi"; -"Thursday" = "Jeudi"; -"Friday" = "Vendredi"; -"Saturday" = "Samedi"; "DayOfTheMonth" = "Jour du mois"; - -"Sun" = "Dim"; -"Mon" = "Lun"; -"Tue" = "Mar"; -"Wed" = "Mer"; -"Thu" = "Jeu"; -"Fri" = "Ven"; -"Sat" = "Sam"; - -"a2_Sunday" = "Di"; -"a2_Monday" = "Lu"; -"a2_Tuesday" = "Ma"; -"a2_Wednesday" = "Me"; -"a2_Thursday" = "Je"; -"a2_Friday" = "Ve"; -"a2_Saturday" = "Sa"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Aujourd'hui"; @@ -63,32 +39,6 @@ "this month" = "ce mois"; -"January" = "Janvier"; -"February" = "Février"; -"March" = "Mars"; -"April" = "Avril"; -"May" = "Mai"; -"June" = "Juin"; -"July" = "Juillet"; -"August" = "Août"; -"September" = "Septembre"; -"October" = "Octobre"; -"November" = "Novembre"; -"December" = "Décembre"; - -"a3_January" = "Jan"; -"a3_February" = "Fev"; -"a3_March" = "Mar"; -"a3_April" = "Avr"; -"a3_May" = "Mai"; -"a3_June" = "Jun"; -"a3_July" = "Jul"; -"a3_August" = "Aou"; -"a3_September" = "Sep"; -"a3_October" = "Oct"; -"a3_November" = "Nov"; -"a3_December" = "Dec"; - "Previous Month" = "Mois précédent"; "Next Month" = "Mois suivant"; diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index 0e75310b6..f1274049c 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Sonntag"; -"Monday" = "Montag"; -"Tuesday" = "Dienstag"; -"Wednesday" = "Mittwoch"; -"Thursday" = "Donnerstag"; -"Friday" = "Freitag"; -"Saturday" = "Samstag"; "DayOfTheMonth" = "Monatstag"; - -"Sun" = "Son"; -"Mon" = "Mon"; -"Tue" = "Die"; -"Wed" = "Mit"; -"Thu" = "Don"; -"Fri" = "Fre"; -"Sat" = "Sam"; - -"a2_Sunday" = "So"; -"a2_Monday" = "Mo"; -"a2_Tuesday" = "Di"; -"a2_Wednesday" = "Mi"; -"a2_Thursday" = "Do"; -"a2_Friday" = "Fr"; -"a2_Saturday" = "Sa"; - "dayLabelFormat" = "%d.%m.%Y"; "today" = "Heute"; @@ -63,32 +39,6 @@ "this month" = "dieser Monat"; -"January" = "Januar"; -"February" = "Februar"; -"March" = "März"; -"April" = "April"; -"May" = "Mai"; -"June" = "Juni"; -"July" = "Juli"; -"August" = "August"; -"September" = "September"; -"October" = "Oktober"; -"November" = "November"; -"December" = "Dezember"; - -"a3_January" = "Jan"; -"a3_February" = "Feb"; -"a3_March" = "Mar"; -"a3_April" = "Apr"; -"a3_May" = "Mai"; -"a3_June" = "Jun"; -"a3_July" = "Jul"; -"a3_August" = "Aug"; -"a3_September" = "Sep"; -"a3_October" = "Okt"; -"a3_November" = "Nov"; -"a3_December" = "Dez"; - "Previous Month" = "Vorheriger Monat"; "Next Month" = "Nächster Monat"; diff --git a/UI/Scheduler/Hungarian.lproj/Localizable.strings b/UI/Scheduler/Hungarian.lproj/Localizable.strings index 0cca4176d..a8c13be21 100644 --- a/UI/Scheduler/Hungarian.lproj/Localizable.strings +++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Vasárnap"; -"Monday" = "Hétfő"; -"Tuesday" = "Kedd"; -"Wednesday" = "Szerda"; -"Thursday" = "Csütörtök"; -"Friday" = "Péntek"; -"Saturday" = "Szombat"; "DayOfTheMonth" = "A hónap napja"; - -"Sun" = "Vas"; -"Mon" = "Hét"; -"Tue" = "Ked"; -"Wed" = "Sze"; -"Thu" = "Csü"; -"Fri" = "Pén"; -"Sat" = "Szo"; - -"a2_Sunday" = "Va"; -"a2_Monday" = "Hé"; -"a2_Tuesday" = "Ke"; -"a2_Wednesday" = "Sz"; -"a2_Thursday" = "Cs"; -"a2_Friday" = "Pé"; -"a2_Saturday" = "Sz"; - "dayLabelFormat" = "%Y.%m.%d"; "today" = "Ma"; @@ -63,32 +39,6 @@ "this month" = "aktuális hónap"; -"January" = "Január"; -"February" = "Február"; -"March" = "Március"; -"April" = "Április"; -"May" = "Május"; -"June" = "Június"; -"July" = "Július"; -"August" = "Augusztus"; -"September" = "Szeptember"; -"October" = "Október"; -"November" = "November"; -"December" = "December"; - -"a3_January" = "Január"; -"a3_February" = "Február"; -"a3_March" = "Március"; -"a3_April" = "Április"; -"a3_May" = "Május"; -"a3_June" = "Június"; -"a3_July" = "Július"; -"a3_August" = "Augusztus"; -"a3_September" = "Szeptember"; -"a3_October" = "Október"; -"a3_November" = "November"; -"a3_December" = "December"; - "Previous Month" = "Előző hónap"; "Next Month" = "Következő hónap"; diff --git a/UI/Scheduler/Icelandic.lproj/Localizable.strings b/UI/Scheduler/Icelandic.lproj/Localizable.strings index d06b81332..012745a14 100644 --- a/UI/Scheduler/Icelandic.lproj/Localizable.strings +++ b/UI/Scheduler/Icelandic.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Sunnudagur"; -"Monday" = "Mánudagur"; -"Tuesday" = "Þriðjudagur"; -"Wednesday" = "Miðvikudagur"; -"Thursday" = "Fimmtudagur"; -"Friday" = "Föstudagur"; -"Saturday" = "Laugardagur"; "DayOfTheMonth" = "Dagur mánaðarins"; - -"Sun" = "Sun"; -"Mon" = "Mán"; -"Tue" = "Þri"; -"Wed" = "Mið"; -"Thu" = "Fim"; -"Fri" = "Fös"; -"Sat" = "Lau"; - -"a2_Sunday" = "Su"; -"a2_Monday" = "Má"; -"a2_Tuesday" = "Þr"; -"a2_Wednesday" = "Mi"; -"a2_Thursday" = "Fi"; -"a2_Friday" = "Fö"; -"a2_Saturday" = "La"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Í dag"; @@ -63,32 +39,6 @@ "this month" = "þessi mánuður"; -"January" = "Janúar"; -"February" = "Febrúar"; -"March" = "Mars"; -"April" = "Apríl"; -"May" = "Maí"; -"June" = "Júní"; -"July" = "Júlí"; -"August" = "Ágúst"; -"September" = "September"; -"October" = "Október"; -"November" = "Nóvember"; -"December" = "Desember"; - -"a3_January" = "Janúar"; -"a3_February" = "Febrúar"; -"a3_March" = "Mars"; -"a3_April" = "Apríl"; -"a3_May" = "Maí"; -"a3_June" = "Júní"; -"a3_July" = "Júlí"; -"a3_August" = "Ágúst"; -"a3_September" = "September"; -"a3_October" = "Október"; -"a3_November" = "Nóvember"; -"a3_December" = "Desember"; - "Previous Month" = "Fyrri mánuður"; "Next Month" = "Næsti mánuður"; diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings index ada7fcb3a..10c96f9d5 100644 --- a/UI/Scheduler/Italian.lproj/Localizable.strings +++ b/UI/Scheduler/Italian.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Domenica"; -"Monday" = "Lunedi"; -"Tuesday" = "Martedi"; -"Wednesday" = "Mercoledi"; -"Thursday" = "Giovedi"; -"Friday" = "Venerdi"; -"Saturday" = "Sabato"; "DayOfTheMonth" = "Giorno del mese"; - -"Sun" = "Dom"; -"Mon" = "Lun"; -"Tue" = "Mar"; -"Wed" = "Mer"; -"Thu" = "Gio"; -"Fri" = "Ven"; -"Sat" = "Sab"; - -"a2_Sunday" = "Do"; -"a2_Monday" = "Lu"; -"a2_Tuesday" = "Ma"; -"a2_Wednesday" = "Me"; -"a2_Thursday" = "Gi"; -"a2_Friday" = "Ve"; -"a2_Saturday" = "Sab"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Oggi"; @@ -63,32 +39,6 @@ "this month" = "questo mese"; -"January" = "Gennaio"; -"February" = "Febbraio"; -"March" = "Marzo"; -"April" = "Aprile"; -"May" = "Maggio"; -"June" = "Giugno"; -"July" = "Luglio"; -"August" = "Agosto"; -"September" = "Settembre"; -"October" = "Ottobre"; -"November" = "Novembre"; -"December" = "Dicembre"; - -"a3_January" = "Gennaio"; -"a3_February" = "Febbraio"; -"a3_March" = "Marzo"; -"a3_April" = "Aprile"; -"a3_May" = "Maggio"; -"a3_June" = "Giugno"; -"a3_July" = "Luglio"; -"a3_August" = "Agosto"; -"a3_September" = "Settembre"; -"a3_October" = "Ottobre"; -"a3_November" = "Novembre"; -"a3_December" = "Dicembre"; - "Previous Month" = "Mese precedente"; "Next Month" = "Mese successivo"; diff --git a/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings b/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings index 162ee7ebd..0e431c1c1 100644 --- a/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings @@ -17,31 +17,7 @@ /* Day */ -"Sunday" = "Søndag"; -"Monday" = "Mandag"; -"Tuesday" = "Tirsdag"; -"Wednesday" = "Onsdag"; -"Thursday" = "Torsdag"; -"Friday" = "Fredag"; -"Saturday" = "Lørdag"; "DayOfTheMonth" = "Dag i måneden"; - -"Sun" = "Søn"; -"Mon" = "Man"; -"Tue" = "Tir"; -"Wed" = "Ons"; -"Thu" = "Tor"; -"Fri" = "Fre"; -"Sat" = "Lør"; - -"a2_Sunday" = "Sø"; -"a2_Monday" = "Ma"; -"a2_Tuesday" = "Ti"; -"a2_Wednesday" = "On"; -"a2_Thursday" = "To"; -"a2_Friday" = "Fr"; -"a2_Saturday" = "Lø"; - "dayLabelFormat" = "%Y-%m-%d"; "today" = "Idag"; @@ -62,32 +38,6 @@ "this month" = "denne måneden"; -"January" = "Januar"; -"February" = "Februar"; -"March" = "Mars"; -"April" = "April"; -"May" = "Mai"; -"June" = "Juni"; -"July" = "Juli"; -"August" = "August"; -"September" = "September"; -"October" = "Oktober"; -"November" = "November"; -"December" = "Desember"; - -"a3_January" = "Januar"; -"a3_February" = "Februar"; -"a3_March" = "Mars"; -"a3_April" = "April"; -"a3_May" = "Mai"; -"a3_June" = "Juni"; -"a3_July" = "Juli"; -"a3_August" = "August"; -"a3_September" = "September"; -"a3_October" = "Oktober"; -"a3_November" = "November"; -"a3_December" = "Desember"; - "Previous Month" = "Forrige måned"; "Next Month" = "Neste måned"; diff --git a/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings b/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings index daba86ccc..05a76cb1b 100644 --- a/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Søndag"; -"Monday" = "Mandag"; -"Tuesday" = "Tirsdag"; -"Wednesday" = "Onsdag"; -"Thursday" = "Torsdag"; -"Friday" = "Fredag"; -"Saturday" = "Lørdag"; "DayOfTheMonth" = "Dag i måneden"; - -"Sun" = "Søn"; -"Mon" = "Man"; -"Tue" = "Tir"; -"Wed" = "Ons"; -"Thu" = "Tor"; -"Fri" = "Fre"; -"Sat" = "Lør"; - -"a2_Sunday" = "Sø"; -"a2_Monday" = "Ma"; -"a2_Tuesday" = "Ti"; -"a2_Wednesday" = "On"; -"a2_Thursday" = "To"; -"a2_Friday" = "Fr"; -"a2_Saturday" = "Lø"; - "dayLabelFormat" = "%Y-%m-%d"; "today" = "Idag"; @@ -63,32 +39,6 @@ "this month" = "denne måneden"; -"January" = "Januar"; -"February" = "Februar"; -"March" = "Mars"; -"April" = "April"; -"May" = "May"; -"June" = "Juni"; -"July" = "Juli"; -"August" = "August"; -"September" = "September"; -"October" = "Oktober"; -"November" = "November"; -"December" = "Desember"; - -"a3_January" = "Januar"; -"a3_February" = "Februar"; -"a3_March" = "Mars"; -"a3_April" = "April"; -"a3_May" = "May"; -"a3_June" = "Juni"; -"a3_July" = "Juli"; -"a3_August" = "August"; -"a3_September" = "September"; -"a3_October" = "Oktober"; -"a3_November" = "November"; -"a3_December" = "Desember"; - "Previous Month" = "Forrige måned"; "Next Month" = "Neste måned"; diff --git a/UI/Scheduler/Polish.lproj/Localizable.strings b/UI/Scheduler/Polish.lproj/Localizable.strings index 49a1624d2..c91d3c495 100644 --- a/UI/Scheduler/Polish.lproj/Localizable.strings +++ b/UI/Scheduler/Polish.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Niedziela"; -"Monday" = "Poniedziałek"; -"Tuesday" = "Wtorek"; -"Wednesday" = "Środa"; -"Thursday" = "Czwartek"; -"Friday" = "Piątek"; -"Saturday" = "Sobota"; "DayOfTheMonth" = "Dzień miesiąca"; - -"Sun" = "Nie"; -"Mon" = "Pon"; -"Tue" = "Wto"; -"Wed" = "Śro"; -"Thu" = "Czw"; -"Fri" = "Pią"; -"Sat" = "Sob"; - -"a2_Sunday" = "Ni"; -"a2_Monday" = "Pn"; -"a2_Tuesday" = "Wt"; -"a2_Wednesday" = "Śr"; -"a2_Thursday" = "Cz"; -"a2_Friday" = "Pi"; -"a2_Saturday" = "So"; - "dayLabelFormat" = "%Y-%m-%d"; "today" = "Dzisiaj"; @@ -63,32 +39,6 @@ "this month" = "ten miesiąc"; -"January" = "Styczeń"; -"February" = "Luty"; -"March" = "Marzec"; -"April" = "Kwiecień"; -"May" = "Maj"; -"June" = "Czerwiec"; -"July" = "Lipiec"; -"August" = "Sierpień"; -"September" = "Wrzesień"; -"October" = "Październik"; -"November" = "Listopad"; -"December" = "Grudzień"; - -"a3_January" = "Styczeń"; -"a3_February" = "Luty"; -"a3_March" = "Marzec"; -"a3_April" = "Kwiecień"; -"a3_May" = "Maj"; -"a3_June" = "Czerwiec"; -"a3_July" = "Lipiec"; -"a3_August" = "Sierpień"; -"a3_September" = "Wrzesień"; -"a3_October" = "Październik"; -"a3_November" = "Listopad"; -"a3_December" = "Grudzień"; - "Previous Month" = "Poprzedni miesiąc"; "Next Month" = "Następny miesiąc"; diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings index 795df06e8..23f94cd3b 100644 --- a/UI/Scheduler/Russian.lproj/Localizable.strings +++ b/UI/Scheduler/Russian.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Воскресенье"; -"Monday" = "Понедельник"; -"Tuesday" = "Вторник"; -"Wednesday" = "Среда"; -"Thursday" = "Четверг"; -"Friday" = "Пятница"; -"Saturday" = "Суббота"; "DayOfTheMonth" = "DayOfTheMonth"; - -"Sun" = "Вск"; -"Mon" = "Пон"; -"Tue" = "Вт"; -"Wed" = "Ср"; -"Thu" = "Чтв"; -"Fri" = "Пят"; -"Sat" = "Суб"; - -"a2_Sunday" = "Вс"; -"a2_Monday" = "Пн"; -"a2_Tuesday" = "Вт"; -"a2_Wednesday" = "Ср"; -"a2_Thursday" = "Чт"; -"a2_Friday" = "Пт"; -"a2_Saturday" = "Сб"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Сегодня"; @@ -63,32 +39,6 @@ "this month" = "этот месяц"; -"January" = "Январь"; -"February" = "Февраль"; -"March" = "Март"; -"April" = "Апрель"; -"May" = "Май"; -"June" = "Июнь"; -"July" = "Июль"; -"August" = "Август"; -"September" = "Сентябрь"; -"October" = "Октябрь"; -"November" = "Ноябрь"; -"December" = "Декабрь"; - -"a3_January" = "Января"; -"a3_February" = "Февраля"; -"a3_March" = "Марта"; -"a3_April" = "Апреля"; -"a3_May" = "Мая"; -"a3_June" = "Июня"; -"a3_July" = "Июля"; -"a3_August" = "Августа"; -"a3_September" = "Сентября"; -"a3_October" = "Октября"; -"a3_November" = "Ноября"; -"a3_December" = "Декабря"; - "Previous Month" = "Предыдущий месяц"; "Next Month" = "Следующий месяц"; diff --git a/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings b/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings index 6bb0305b8..66d50a3ca 100644 --- a/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings +++ b/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Domingo"; -"Monday" = "Lunes"; -"Tuesday" = "Martes"; -"Wednesday" = "Miércoles"; -"Thursday" = "Jueves"; -"Friday" = "Viernes"; -"Saturday" = "Sábado"; "DayOfTheMonth" = "Día del mes"; - -"Sun" = "Dom"; -"Mon" = "Lun"; -"Tue" = "Mar"; -"Wed" = "Mié"; -"Thu" = "Jue"; -"Fri" = "Vie"; -"Sat" = "Sáb"; - -"a2_Sunday" = "Do"; -"a2_Monday" = "Lu"; -"a2_Tuesday" = "Ma"; -"a2_Wednesday" = "Mi"; -"a2_Thursday" = "Ju"; -"a2_Friday" = "Vi"; -"a2_Saturday" = "Sá"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Hoy"; @@ -63,32 +39,6 @@ "this month" = "éste mes"; -"January" = "Enero"; -"February" = "Febrero"; -"March" = "Marzo"; -"April" = "Abril"; -"May" = "Mayo"; -"June" = "Junio"; -"July" = "Julio"; -"August" = "Agosto"; -"September" = "Septiembre"; -"October" = "Octubre"; -"November" = "Noviembre"; -"December" = "Diciembre"; - -"a3_January" = "Enero"; -"a3_February" = "Febrero"; -"a3_March" = "Marzo"; -"a3_April" = "Abril"; -"a3_May" = "Mayo"; -"a3_June" = "Junio"; -"a3_July" = "Julio"; -"a3_August" = "Agosto"; -"a3_September" = "Septiembre"; -"a3_October" = "Octubre"; -"a3_November" = "Noviembre"; -"a3_December" = "Diciembre"; - "Previous Month" = "Mes anterior"; "Next Month" = "Próximo mes"; diff --git a/UI/Scheduler/SpanishSpain.lproj/Localizable.strings b/UI/Scheduler/SpanishSpain.lproj/Localizable.strings index 1498be81e..88cb43278 100644 --- a/UI/Scheduler/SpanishSpain.lproj/Localizable.strings +++ b/UI/Scheduler/SpanishSpain.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Domingo"; -"Monday" = "Lunes"; -"Tuesday" = "Martes"; -"Wednesday" = "Miércoles"; -"Thursday" = "Jueves"; -"Friday" = "Viernes"; -"Saturday" = "Sábado"; "DayOfTheMonth" = "Día del mes"; - -"Sun" = "Dom"; -"Mon" = "Lun"; -"Tue" = "Mar"; -"Wed" = "Mié"; -"Thu" = "Jue"; -"Fri" = "Vie"; -"Sat" = "Sáb"; - -"a2_Sunday" = "Do"; -"a2_Monday" = "Lu"; -"a2_Tuesday" = "Ma"; -"a2_Wednesday" = "Mi"; -"a2_Thursday" = "Ju"; -"a2_Friday" = "Vi"; -"a2_Saturday" = "Sá"; - "dayLabelFormat" = "%d/%m/%Y"; "today" = "Hoy"; @@ -63,32 +39,6 @@ "this month" = "éste mes"; -"January" = "Enero"; -"February" = "Febrero"; -"March" = "Marzo"; -"April" = "Abril"; -"May" = "Mayo"; -"June" = "Junio"; -"July" = "Julio"; -"August" = "Agosto"; -"September" = "Septiembre"; -"October" = "Octubre"; -"November" = "Noviembre"; -"December" = "Diciembre"; - -"a3_January" = "Enero"; -"a3_February" = "Febrero"; -"a3_March" = "Marzo"; -"a3_April" = "Abril"; -"a3_May" = "Mayo"; -"a3_June" = "Junio"; -"a3_July" = "Julio"; -"a3_August" = "Agosto"; -"a3_September" = "Septiembre"; -"a3_October" = "Octubre"; -"a3_November" = "Noviembre"; -"a3_December" = "Diciembre"; - "Previous Month" = "Mes anterior"; "Next Month" = "Próximo mes"; diff --git a/UI/Scheduler/Swedish.lproj/Localizable.strings b/UI/Scheduler/Swedish.lproj/Localizable.strings index c9e2bb0d1..17fc68997 100644 --- a/UI/Scheduler/Swedish.lproj/Localizable.strings +++ b/UI/Scheduler/Swedish.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Söndag"; -"Monday" = "Måndag"; -"Tuesday" = "Tisdag"; -"Wednesday" = "Onsdag"; -"Thursday" = "Torsdag"; -"Friday" = "Fredag"; -"Saturday" = "Lördag"; "DayOfTheMonth" = "Dag i månaden"; - -"Sun" = "Sön"; -"Mon" = "Mån"; -"Tue" = "Tis"; -"Wed" = "Ons"; -"Thu" = "Tor"; -"Fri" = "Fre"; -"Sat" = "Lör"; - -"a2_Sunday" = "Sö"; -"a2_Monday" = "Må"; -"a2_Tuesday" = "Ti"; -"a2_Wednesday" = "On"; -"a2_Thursday" = "To"; -"a2_Friday" = "Fr"; -"a2_Saturday" = "Lö"; - "dayLabelFormat" = "%Y-%m-%d"; "today" = "Idag"; @@ -63,32 +39,6 @@ "this month" = "denna månad"; -"January" = "Januari"; -"February" = "Februari"; -"March" = "Mars"; -"April" = "April"; -"May" = "Maj"; -"June" = "Juni"; -"July" = "Juli"; -"August" = "Augusti"; -"September" = "September"; -"October" = "Oktober"; -"November" = "November"; -"December" = "December"; - -"a3_January" = "Januari"; -"a3_February" = "Februari"; -"a3_March" = "Mars"; -"a3_April" = "April"; -"a3_May" = "Maj"; -"a3_June" = "Juni"; -"a3_July" = "Juli"; -"a3_August" = "Augusti"; -"a3_September" = "September"; -"a3_October" = "Oktober"; -"a3_November" = "November"; -"a3_December" = "December"; - "Previous Month" = "Föregående månad"; "Next Month" = "Nästa månad"; diff --git a/UI/Scheduler/Ukrainian.lproj/Localizable.strings b/UI/Scheduler/Ukrainian.lproj/Localizable.strings index 5a0924955..6a6e58049 100644 --- a/UI/Scheduler/Ukrainian.lproj/Localizable.strings +++ b/UI/Scheduler/Ukrainian.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Неділя"; -"Monday" = "Понеділок"; -"Tuesday" = "Вівторок"; -"Wednesday" = "Середа"; -"Thursday" = "Четвер"; -"Friday" = "П’ятниця"; -"Saturday" = "Субота"; "DayOfTheMonth" = "День місяця"; - -"Sun" = "Нед"; -"Mon" = "Пон"; -"Tue" = "Вт"; -"Wed" = "Сер"; -"Thu" = "Чтв"; -"Fri" = "Птн"; -"Sat" = "Суб"; - -"a2_Sunday" = "Нд"; -"a2_Monday" = "Пн"; -"a2_Tuesday" = "Вт"; -"a2_Wednesday" = "Ср"; -"a2_Thursday" = "Чт"; -"a2_Friday" = "Пт"; -"a2_Saturday" = "Сб"; - "dayLabelFormat" = "%d.%m.%Y"; "today" = "Сьогодні"; @@ -63,32 +39,6 @@ "this month" = "цей місяць"; -"January" = "Січень"; -"February" = "Лютий"; -"March" = "Березень"; -"April" = "Квітень"; -"May" = "Травень"; -"June" = "Червень"; -"July" = "Липень"; -"August" = "Серпень"; -"September" = "Вересень"; -"October" = "Жовтень"; -"November" = "Листопад"; -"December" = "Грудень"; - -"a3_January" = "Січня"; -"a3_February" = "Лютого"; -"a3_March" = "Березня"; -"a3_April" = "Квітня"; -"a3_May" = "Травня"; -"a3_June" = "Червня"; -"a3_July" = "Липня"; -"a3_August" = "Серпня"; -"a3_September" = "Вересня"; -"a3_October" = "Жовтня"; -"a3_November" = "Листопада"; -"a3_December" = "Грудня"; - "Previous Month" = "Один місяць назад"; "Next Month" = "Один місяць вперед"; diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings index 9a4154ce8..5cc6ca3f9 100644 --- a/UI/Scheduler/Welsh.lproj/Localizable.strings +++ b/UI/Scheduler/Welsh.lproj/Localizable.strings @@ -18,31 +18,7 @@ /* Day */ -"Sunday" = "Sul"; -"Monday" = "Llun"; -"Tuesday" = "Mawrth"; -"Wednesday" = "Mercher"; -"Thursday" = "Iau"; -"Friday" = "Gwener"; -"Saturday" = "Sadwrn"; "DayOfTheMonth" = "DayOfTheMonth"; - -"Sun" = "Sul"; -"Mon" = "Llu"; -"Tue" = "Maw"; -"Wed" = "Mer"; -"Thu" = "Iau"; -"Fri" = "Gwe"; -"Sat" = "Sad"; - -"a2_Sunday" = "Su"; -"a2_Monday" = "Ll"; -"a2_Tuesday" = "Ma"; -"a2_Wednesday" = "Me"; -"a2_Thursday" = "Ia"; -"a2_Friday" = "Gw"; -"a2_Saturday" = "Sa"; - "dayLabelFormat" = "%m/%d/%Y"; "today" = "Heddiw"; @@ -63,32 +39,6 @@ "this month" = "mis hon"; -"January" = "Ionawr"; -"February" = "Chwefror"; -"March" = "Mawrth"; -"April" = "Ebrill"; -"May" = "Mai"; -"June" = "Mehefin"; -"July" = "Gorffennaf"; -"August" = "Awst"; -"September" = "Medi"; -"October" = "Hydref"; -"November" = "Tachwedd"; -"December" = "Rhagfyr"; - -"a3_January" = "Ionawr"; -"a3_February" = "Chwefror"; -"a3_March" = "Mawrth"; -"a3_April" = "Ebrill"; -"a3_May" = "Mai"; -"a3_June" = "Mehefin"; -"a3_July" = "Gorffennaf"; -"a3_August" = "Awst"; -"a3_September" = "Medi"; -"a3_October" = "Hydref"; -"a3_November" = "Tachwedd"; -"a3_December" = "Rhagfyr"; - "Previous Month" = "Previous Month"; "Next Month" = "Next Month"; diff --git a/UI/WebServerResources/JavascriptAPIExtensions.js b/UI/WebServerResources/JavascriptAPIExtensions.js index a4b7e1414..7e2143a69 100644 --- a/UI/WebServerResources/JavascriptAPIExtensions.js +++ b/UI/WebServerResources/JavascriptAPIExtensions.js @@ -92,29 +92,6 @@ Date.prototype.clone = function() { return newDate; } -Date.prototype.sogoDayName = function() { - var dayName = ""; - - var day = this.getDay(); - if (day == 0) { - dayName = labels['a2_Sunday']; - } else if (day == 1) { - dayName = labels['a2_Monday']; - } else if (day == 2) { - dayName = labels['a2_Tuesday']; - } else if (day == 3) { - dayName = labels['a2_Wednesday']; - } else if (day == 4) { - dayName = labels['a2_Thursday']; - } else if (day == 5) { - dayName = labels['a2_Friday']; - } else if (day == 6) { - dayName = labels['a2_Saturday']; - } - - return dayName; -}; - Date.prototype.deltaDays = function(otherDate) { var day1 = this.getTime(); var day2 = otherDate.getTime(); @@ -210,10 +187,6 @@ Date.prototype.stringWithSeparator = function(separator) { return str; }; -Date.prototype.sogoFreeBusyStringWithSeparator = function(separator) { - return this.sogoDayName() + ", " + this.stringWithSeparator(separator); -}; - Date.prototype.addDays = function(nbrDays) { var milliSeconds = this.getTime(); milliSeconds += 86400000 * nbrDays;