See ChangeLog.

Monotone-Parent: 8ca19f2794000c75e6fc0e8f81c2412fe0a34699
Monotone-Revision: eae8192649cef1bdd72533a053dc0aef3baca4e7

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-31T20:18:49
maint-2.0.2
Francis Lachapelle 2012-01-31 20:18:49 +00:00
parent a27128037e
commit d49193f6fc
2 changed files with 18 additions and 2 deletions

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):

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)