Differences From Artifact [80430a2785]:
- File
src/OFLocale.m
— part of check-in
[d74f244ab7]
at
2020-08-12 20:56:32
on branch trunk
— Avoid using (u)intmax_t in methods
It is not guaranteed that a type encoding for it exists. (user: js, size: 15592) [annotate] [blame] [check-ins using]
To Artifact [5d8907dfbe]:
- File src/OFLocale.m — part of check-in [8611f48f42] at 2020-08-13 21:07:20 on branch trunk — OFString: Rename JSONValue to objectByParsingJSON (user: js, size: 15621) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
508 509 510 511 512 513 514 | if (_language == nil) return; pool = objc_autoreleasePoolPush(); mapPath = [path stringByAppendingPathComponent: @"languages.json"]; @try { | | > | 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 | if (_language == nil) return; pool = objc_autoreleasePoolPush(); mapPath = [path stringByAppendingPathComponent: @"languages.json"]; @try { map = [OFString stringWithContentsOfFile: mapPath] .objectByParsingJSON; } @catch (OFOpenItemFailedException *e) { objc_autoreleasePoolPop(pool); return; } language = _language.lowercaseString; territory = _territory.lowercaseString; |
︙ | ︙ | |||
533 534 535 536 537 538 539 | return; } languageFile = [path stringByAppendingPathComponent: [languageFile stringByAppendingString: @".json"]]; [_localizedStrings addObject: | | > | 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 | return; } languageFile = [path stringByAppendingPathComponent: [languageFile stringByAppendingString: @".json"]]; [_localizedStrings addObject: [OFString stringWithContentsOfFile: languageFile] .objectByParsingJSON]; objc_autoreleasePoolPop(pool); } #endif - (OFString *)localizedStringForID: (OFConstantString *)ID fallback: (id)fallback, ... |
︙ | ︙ |