gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update autoupdatingCurrentLocale whenever the Locale default changes. The -currentLocale method now also checks Locale default.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31972 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Stefan Bidigaray 2011-01-29 15:33:27 +00:00
parent e652a5db92
commit b06267a94f
3 changed files with 57 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-01-29 Stefan Bidigaray <stefanbidi@gmail.com>
* Headers/Foundation/NSLocale.h: Use GS_EXPOSE(NSLocale).
* Source/NSLocale.m: ([-autoupdatingCurrentLocale]) Handle locale updates.
([-currentLocale]) Check Locale default for current user's locale.
([-preferredLanguages]) Do not add same language multiple times.
2011-01-28 Stefan Bidigaray <stefanbidi@gmail.com>
* Source/NSNumberFormatter.m: Fixed errors found by test suite.

2
Headers/Foundation/NSLocale.h
View file

@ -99,7 +99,7 @@ GS_EXPORT NSString * const NSISO8601Calendar;
*/
@interface NSLocale : NSObject <NSCoding, NSCopying>
{
#if GS_EXPOSE(NSUserDefaults)
#if GS_EXPOSE(NSLocale)
@private
NSString *_localeId;
NSMutableDictionary *_components;

57
Source/NSLocale.m
View file

@ -32,6 +32,7 @@
#import "Foundation/NSDictionary.h"
#import "Foundation/NSLock.h"
#import "Foundation/NSValue.h"
#import "Foundation/NSNotification.h"
#import "Foundation/NSNumberFormatter.h"
#import "Foundation/NSUserDefaults.h"
#import "Foundation/NSString.h"
@ -182,14 +183,45 @@ static NSRecursiveLock *classLock = nil;
}
}
+ (void) defaultsDidChange: (NSNotification*)n
{
NSUserDefaults *defs;
NSString *name;
defs = [NSUserDefaults standardUserDefaults];
name = [defs stringForKey: @"Locale"];
if ([name isEqual: [autoupdatingLocale localeIdentifier]] == NO)
{
[classLock lock];
RELEASE(autoupdatingLocale->_localeId);
RELEASE(autoupdatingLocale->_components);
autoupdatingLocale->_localeId = RETAIN(name);
autoupdatingLocale->_components = nil;
RELEASE(currentLocale);
currentLocale = nil;
[classLock unlock];
[[NSNotificationCenter defaultCenter]
postNotificationName: NSCurrentLocaleDidChangeNotification
object: nil];
}
}
+ (id) autoupdatingCurrentLocale
{
// FIXME
NSLocale *result;
[classLock lock];
if (nil == autoupdatingLocale)
{
autoupdatingLocale = [[self currentLocale] copy];
[[NSNotificationCenter defaultCenter]
addObserver: self
selector: @selector(defaultsDidChange:)
name: NSUserDefaultsDidChangeNotification
object: nil];
}
result = RETAIN(autoupdatingLocale);
@ -259,6 +291,9 @@ static NSRecursiveLock *classLock = nil;
NSMutableString *mStr;
NSRange range;
if (string == nil)
return nil;
if (canonicalLocales == nil)
[self _updateCanonicalLocales];
@ -390,11 +425,15 @@ static NSRecursiveLock *classLock = nil;
[classLock lock];
if (nil == currentLocale)
{
#if GS_USE_ICU == 1
const char *cLocaleId = uloc_getDefault ();
NSString *localeId = [NSString stringWithUTF8String: cLocaleId];
currentLocale = [[NSLocale alloc] initWithLocaleIdentifier: localeId];
#endif
NSString *localeId;
[classLock unlock];
localeId =
[[NSUserDefaults standardUserDefaults] objectForKey: @"Locale"];
[classLock lock];
if (currentLocale == nil)
currentLocale = [[NSLocale alloc] initWithLocaleIdentifier: localeId];
}
result = RETAIN(currentLocale);
[classLock unlock];
@ -502,9 +541,11 @@ static NSRecursiveLock *classLock = nil;
cnt = [languages count];
while (idx < cnt)
{
NSString *lang = [languages objectAtIndex: idx];
NSString *lang = [self canonicalLanguageIdentifierFromString:
[languages objectAtIndex: idx]];
if (![mArray containsObject: lang])
[mArray addObject: [self canonicalLanguageIdentifierFromString: lang]];
[mArray addObject: lang];
++idx;
}