Differences From Artifact [e8b5569b76]:
- File src/OFLocale.m — part of check-in [915bfc7431] at 2022-09-29 20:27:57 on branch trunk — OFLocale: Rename a few methods (user: js, size: 15651) [annotate] [blame] [check-ins using] [more...]
To Artifact [552516ebb5]:
- File
src/OFLocale.m
— part of check-in
[88ed5be671]
at
2022-11-23 21:39:13
on branch trunk
— Use a URI for the localization directory
This theoretically allows embedding localizations. While this isn't
great as all will be held in memory but only one will be used, there
might be cases where everything should be in one binary. (user: js, size: 15623) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
14 15 16 17 18 19 20 | */ #include "config.h" #include <locale.h> #import "OFLocale.h" | < > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | */ #include "config.h" #include <locale.h> #import "OFLocale.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OFString.h" #import "OFURI.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" #ifdef OF_AMIGAOS |
| ︙ | ︙ | |||
357 358 359 360 361 362 363 |
}
+ (OFString *)decimalSeparator
{
return currentLocale.decimalSeparator;
}
| < | | < | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 |
}
+ (OFString *)decimalSeparator
{
return currentLocale.decimalSeparator;
}
+ (void)addLocalizationDirectoryURI: (OFURI *)URI
{
[currentLocale addLocalizationDirectoryURI: URI];
}
- (instancetype)init
{
self = [super init];
@try {
#ifndef OF_AMIGAOS
|
| ︙ | ︙ | |||
490 491 492 493 494 495 496 | [_countryCode release]; [_decimalSeparator release]; [_localizedStrings release]; [super dealloc]; } | < | > | | | | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 |
[_countryCode release];
[_decimalSeparator release];
[_localizedStrings release];
[super dealloc];
}
- (void)addLocalizationDirectoryURI: (OFURI *)URI
{
void *pool;
OFURI *mapURI, *localizationURI;
OFString *languageCode, *countryCode, *localizationFile;
OFDictionary *map;
if (_languageCode == nil)
return;
pool = objc_autoreleasePoolPush();
mapURI = [URI URIByAppendingPathComponent: @"localizations.json"];
@try {
map = [[OFString stringWithContentsOfURI: mapURI]
objectByParsingJSON];
} @catch (OFOpenItemFailedException *e) {
objc_autoreleasePoolPop(pool);
return;
}
languageCode = _languageCode.lowercaseString;
|
| ︙ | ︙ | |||
528 529 530 531 532 533 534 |
objectForKey: @""];
if (localizationFile == nil) {
objc_autoreleasePoolPop(pool);
return;
}
| | | | < | 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 |
objectForKey: @""];
if (localizationFile == nil) {
objc_autoreleasePoolPop(pool);
return;
}
localizationURI = [URI URIByAppendingPathComponent:
[localizationFile stringByAppendingString: @".json"]];
[_localizedStrings addObject: [[OFString stringWithContentsOfURI:
localizationURI] objectByParsingJSON]];
objc_autoreleasePoolPop(pool);
}
- (OFString *)localizedStringForID: (OFConstantString *)ID
fallback: (id)fallback, ...
{
OFString *ret;
va_list args;
|
| ︙ | ︙ |