amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-06 17:05:10 +00:00
Code Issues Projects Releases Wiki Activity

merge of '6418d36640f538c1fb05b31bb43b1a778ad3c093'

Browse Source 
and 'eae8192649cef1bdd72533a053dc0aef3baca4e7'

Monotone-Parent: 6418d36640f538c1fb05b31bb43b1a778ad3c093
Monotone-Parent: eae8192649cef1bdd72533a053dc0aef3baca4e7
Monotone-Revision: d880f3f750251d35b56db7d720ccacbdeead7540

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-31T21:53:10
This commit is contained in:
Francis Lachapelle
2012-01-31 21:53:10 +00:00
parent 21b84c60a5 d49193f6fc
commit 16edbd7024
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2012-01-31 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/WOResourceManager+SOGo.m
(-pathToLocaleForLanguageNamed:): if the language has a CamelCase
form, add the first part to the lookup languages.
2012-01-30 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxCalUserRightsEditor.js (onUpdateACL):
Main/SOGo.m
+1 -1
View File
@@ -509,9 +509,9 @@ static BOOL debugLeaks;
}
if (!locale)
// no appropriate language, fallback to default
locale = [[self resourceManager] localeForLanguageNamed: @"English"];
/* no appropriate language, fallback to default */
return locale;
}
SoObjects/SOGo/WOResourceManager+SOGo.m
+12 -2
View File
@@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#import <Foundation/NSCharacterSet.h>
#import <Foundation/NSData.h>
#import <Foundation/NSDictionary.h>
@@ -33,12 +34,21 @@
{
static Class MainProduct = Nil;
NSString *lpath;
NSRange range;
NSMutableArray *languages;
#warning TODO: create method "languagesBeginingWith:"
languages = [NSMutableArray arrayWithObject: _name];
// If the language has a CamelCase form, add the first part to the lookup languages.
range = [_name rangeOfCharacterFromSet: [NSCharacterSet uppercaseLetterCharacterSet]
options: NSBackwardsSearch
range: NSMakeRange(1, [_name length] - 1)];
if (range.location != NSNotFound && range.location > 0)
[languages addObject: [_name substringToIndex: range.location]];
lpath = [self pathForResourceNamed: @"Locale"
inFramework: nil
languages: [NSArray arrayWithObject:_name]];
languages: languages];
if (![lpath length])
{
if (!MainProduct)