X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMapping.m;h=0e67cd3469e66f3f7e6b2072b6843aa8629238a0;hp=355dbccdf58951959b52f630ad841665626ccea7;hb=235c087385a6e959ba7edefe4a3cbbbc00b2a534;hpb=1ddf0ccce8bbc789483ae087390c2e93abdbd7ea diff --git a/Classes/NJMapping.m b/Classes/NJMapping.m index 355dbcc..0e67cd3 100644 --- a/Classes/NJMapping.m +++ b/Classes/NJMapping.m @@ -17,14 +17,22 @@ // Extra checks during initialization because the data is often loaded // from untrusted serializations. -- (id)initWithName:(NSString *)name { +- (id)init { if ((self = [super init])) { - self.name = [name isKindOfClass:NSString.class] ? name : @"Untitled"; + self.name = NSLocalizedString(@"Untitled", @"name for new mappings"); _entries = [[NSMutableDictionary alloc] init]; } return self; } +- (id)initWithName:(NSString *)name { + if ((self = [self init])) { + if ([name isKindOfClass:NSString.class]) + self.name = name; + } + return self; +} + - (id)initWithSerialization:(NSDictionary *)serialization mappings:(NSArray *)mappings { if ((self = [self initWithName:serialization[@"name"]])) { @@ -108,7 +116,8 @@ && [serialization[@"entries"] isKindOfClass:NSDictionary.class])) { *error = [NSError errorWithDomain:@"Enjoyable" code:0 - description:@"This isn't a valid mapping file."]; + description:NSLocalizedString(@"invalid mapping file", + @"error when imported file was JSON but not a mapping")]; return nil; }