Overview
| Comment: | OFLocalization: Ignore missing language files |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b62015c5b8692efbd75825d4bb6e354c |
| User & Date: | js on 2017-11-19 22:33:15 |
| Other Links: | manifest | tags |
Context
|
2017-11-20
| ||
| 22:35 | OFSetTests: Test all implementations check-in: 7c8ac46f53 user: js tags: trunk | |
|
2017-11-19
| ||
| 22:33 | OFLocalization: Ignore missing language files check-in: b62015c5b8 user: js tags: trunk | |
| 21:57 | OFHTTPClient: Improve exception reporting check-in: dd5a5f50e3 user: js tags: trunk | |
Changes
Modified src/OFLocalization.m from [857470cd08] to [6dc81e16f4].
| ︙ | ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "OFLocalization.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #ifdef OF_MORPHOS # define BOOL EXEC_BOOL # include <proto/dos.h> # include <proto/locale.h> # undef BOOL #endif | > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #import "OFLocalization.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFOpenItemFailedException.h" #ifdef OF_MORPHOS # define BOOL EXEC_BOOL # include <proto/dos.h> # include <proto/locale.h> # undef BOOL #endif |
| ︙ | ︙ | |||
245 246 247 248 249 250 251 | if (_language == nil) return; pool = objc_autoreleasePoolPush(); mapPath = [path stringByAppendingPathComponent: @"languages.json"]; | > | > > > > | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 |
if (_language == nil)
return;
pool = objc_autoreleasePoolPush();
mapPath = [path stringByAppendingPathComponent: @"languages.json"];
@try {
map = [[OFString stringWithContentsOfFile: mapPath] JSONValue];
} @catch (OFOpenItemFailedException *e) {
objc_autoreleasePoolPop(pool);
return;
}
language = [_language lowercaseString];
territory = [_territory lowercaseString];
if (territory == nil)
territory = @"";
|
| ︙ | ︙ |