@@ -26,11 +26,11 @@ #import "OFSHA224Hash.h" #import "OFSHA256Hash.h" #import "OFSHA384Hash.h" #import "OFSHA512Hash.h" #import "OFStdIOStream.h" -#import "OFLocalization.h" +#import "OFLocale.h" #import "OFSandbox.h" #import "OFOpenItemFailedException.h" #import "OFReadFailedException.h" @@ -91,13 +91,13 @@ [sandbox release]; } #endif #ifndef OF_AMIGAOS - [OFLocalization addLanguageDirectory: @LANGUAGE_DIR]; + [OFLocale addLanguageDirectory: @LANGUAGE_DIR]; #else - [OFLocalization addLanguageDirectory: @"PROGDIR:/share/ofhash/lang"]; + [OFLocale addLanguageDirectory: @"PROGDIR:/share/ofhash/lang"]; #endif if ([arguments count] < 2) help(); @@ -124,12 +124,11 @@ file = [OFFile fileWithPath: path mode: @"r"]; } @catch (OFOpenItemFailedException *e) { OFString *error = [OFString stringWithCString: strerror([e errNo]) - encoding: [OFLocalization - encoding]]; + encoding: [OFLocale encoding]]; [of_stderr writeLine: OF_LOCALIZED( @"failed_to_open_file", @"Failed to open file %[file]: %[error]", @"file", [e path], @@ -150,12 +149,11 @@ length = [file readIntoBuffer: buffer length: 1024]; } @catch (OFReadFailedException *e) { OFString *error = [OFString stringWithCString: strerror([e errNo]) - encoding: [OFLocalization - encoding]]; + encoding: [OFLocale encoding]]; [of_stderr writeLine: OF_LOCALIZED( @"failed_to_read_file", @"Failed to read %[file]: %[error]", @"file", path,