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

Language support fix.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9206 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2001-02-22 07:36:05 +00:00
parent d7459f6dc7
commit 90d54ae779
2 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2001-02-22 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUserDefaults.m: Fixes to prevent problems obtaining
languages array due to attempts to use partially constructed
standard user defaults object.
2001-02-21 Adam Fedor <fedor@gnu.org>
* Documenation/install.texi: Update.

35
Source/NSUserDefaults.m
View file

@ -228,8 +228,16 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
NSEnumerator *enumerator;
if (setSharedDefaults)
return sharedDefaults;
{
return sharedDefaults;
}
setSharedDefaults = YES;
/*
* Get the user languages *before* setting up sharedDefaults, to avoid
* the userLanguages method trying to look up languages in a partially
* constructed user defaults object.
*/
uL = [[self class] userLanguages];
// Create new sharedDefaults (NOTE: Not added to the autorelease pool!)
sharedDefaults = [[self alloc] init];
if (sharedDefaults == nil)
@ -243,7 +251,6 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
/* Set up language constants */
added_locale = NO;
added_lang = NO;
uL = [[self class] userLanguages];
enumerator = [uL objectEnumerator];
while ((lang = [enumerator nextObject]))
{
@ -308,14 +315,26 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
tempDefaults = [[self alloc] init];
if (tempDefaults != nil)
{
[tempDefaults __createStandardSearchList];
NSMutableArray *sList;
/*
* Can't use the standard method to set up a search list,
* it would cause mutual recursion as it includes languages.
*/
sList = [[NSMutableArray alloc] initWithCapacity: 4];
[sList addObject: NSArgumentDomain];
[sList addObject: processName];
[sList addObject: NSGlobalDomain];
[sList addObject: NSRegistrationDomain];
[tempDefaults setSearchList: sList];
RELEASE(sList);
currLang = [tempDefaults stringArrayForKey: @"Languages"];
RELEASE(tempDefaults);
AUTORELEASE(tempDefaults);
}
}
else
{
currLang = [[self standardUserDefaults] stringArrayForKey: @"Languages"];
currLang = [[self standardUserDefaults] stringArrayForKey: @"Languages"];
}
if (currLang == nil && locale != 0 && GSLanguageFromLocale(locale))
{
@ -1025,8 +1044,8 @@ static NSString *pathForUser(NSString *user)
*************************************************************************/
- (void) __createStandardSearchList
{
NSArray *uL = [[self class] userLanguages];
NSEnumerator *enumerator = [uL objectEnumerator];
NSArray *uL;
NSEnumerator *enumerator;
id object;
// Note: The search list should exist!
@ -1041,6 +1060,8 @@ static NSString *pathForUser(NSString *user)
[_searchList addObject: NSGlobalDomain];
// 4. User's preferred languages
uL = [[self class] userLanguages];
enumerator = [uL objectEnumerator];
while ((object = [enumerator nextObject]))
{
[_searchList addObject: object];