gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement missing method

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23487 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-09-13 07:31:38 +00:00
parent e176abe621
commit 79c2ae503c
3 changed files with 61 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Source/NSBundle.m
View file

@ -1597,7 +1597,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
}
+ (NSArray*) _pathsForResourcesOfType: (NSString*)extension
inRootDirectory: (NSString*)bundlePath
inRootDirectory: (NSString*)bundlePath
inSubDirectory: (NSString *)subPath
{
BOOL allfiles;
@ -1657,18 +1657,21 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
inDirectory: subPath];
enumerator = [paths objectEnumerator];
while( (path = [enumerator nextObject]) )
while ((path = [enumerator nextObject]) != nil)
{
/* Add all non-localized paths, plus ones in the particular localization
(if there is one). */
NSString *theDir = [path stringByDeletingLastPathComponent];
if ([[theDir pathExtension] isEqual: @"lproj"] == NO
|| (localizationName != nil
&& [localizationName length] != 0
&& [[theDir lastPathComponent] hasPrefix: localizationName]) )
{
if ([[theDir pathExtension] isEqual: @"lproj"] == NO)
{
[result addObject: path];
}
else if ([localizationName length] > 0
&& [[theDir lastPathComponent] hasPrefix: localizationName])
{
[result insertObject: path atIndex: 0];
}
}
return result;
@ -1679,8 +1682,34 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
inDirectory: (NSString*)subPath
forLocalization: (NSString*)localizationName
{
[self notImplemented: _cmd];
return nil;
CREATE_AUTORELEASE_POOL(arp);
NSString *result = nil;
NSArray *array;
array = [self pathsForResourcesOfType: ext
inDirectory: subPath
forLocalization: localizationName];
if (array != nil)
{
NSEnumerator *enumerator = [array objectEnumerator];
NSString *path;
name = [name stringByAppendingPathExtension: ext];
while ((path = [enumerator nextObject]) != nil)
{
NSString *found = [path lastPathComponent];
if ([found isEqualToString: name] == YES)
{
result = path;
break; // localised paths occur before non-localised
}
}
}
RETAIN(result);
DESTROY(arp);
return AUTORELEASE(result);
}
+ (NSArray *) preferredLocalizationsFromArray: (NSArray *)localizationsArray
@ -1709,7 +1738,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
return [array makeImmutableCopyOnFail: NO];
}
- (NSDictionary *)localizedInfoDictionary
- (NSDictionary*) localizedInfoDictionary
{
NSString *path;
NSArray *locales;