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

Merge pull request #493 from gnustep/nsbundle-lang-canonical

Browse source 
NSBundle: fix es.lproj path not generated
This commit is contained in:
rfm 2025-04-17 14:49:00 +01:00 committed by GitHub
commit 283ecfe8b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/NSBundle.m
View file

@ -124,27 +124,32 @@ altLang(NSString *full)
}
}
if ((r = [canon rangeOfString: @"-"]).length > 1)
if ((r = [full rangeOfString: @"-"]).length > 1)
{
dialect = [canon substringFromIndex: NSMaxRange(r)];
lang = [canon substringToIndex: r.location];
dialect = [full substringFromIndex: NSMaxRange(r)];
lang = [full substringToIndex: r.location];
if ((r = [dialect rangeOfString: @"_"]).length > 1)
{
region = [dialect substringFromIndex: NSMaxRange(r)];
dialect = [dialect substringToIndex: r.location];
}
}
else if ((r = [canon rangeOfString: @"_"]).length > 1)
else if ((r = [full rangeOfString: @"_"]).length > 1)
{
region = [canon substringFromIndex: NSMaxRange(r)];
lang = [canon substringToIndex: r.location];
region = [full substringFromIndex: NSMaxRange(r)];
lang = [full substringToIndex: r.location];
}
else
{
lang = canon;
lang = full;
}
a = [NSMutableArray arrayWithCapacity: 5];
/* We now that the canonical language does not have a variant or region
* extension
*/
[a addObject: canon];
if (nil != dialect && nil != region)
{
[a addObject: [NSString stringWithFormat: @"%@-%@_%@",
@ -165,6 +170,7 @@ altLang(NSString *full)
{
[a addObject: alias];
}
NSLog(@"Alt ALngs: %@ canon=%@ alias=%@", a, canon, alias);
}
return a;
}