diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-01-27 20:38:23 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-01-27 20:38:23 +0000 |
| commit | 8db2f78294982e89fce5a162d92b2be6d9291aa1 (patch) | |
| tree | b8dc7736f4af896aa3ed3fa9a96d1f3c4bfd0e59 /Source/MGTemplateEngine.m | |
| parent | fa7cff57548edc51420693e6909fe2adb3c18951 (diff) | |
| parent | 7cc062247ff23496dd0390cf07b5d45d6bc49777 (diff) | |
| download | sequelpro-8db2f78294982e89fce5a162d92b2be6d9291aa1.tar.gz sequelpro-8db2f78294982e89fce5a162d92b2be6d9291aa1.tar.bz2 sequelpro-8db2f78294982e89fce5a162d92b2be6d9291aa1.zip | |
Bring outline view branch up to date with trunk (r3056:r3162).
Diffstat (limited to 'Source/MGTemplateEngine.m')
| -rw-r--r-- | Source/MGTemplateEngine.m | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/MGTemplateEngine.m b/Source/MGTemplateEngine.m index 86068b66..89ea3a1d 100644 --- a/Source/MGTemplateEngine.m +++ b/Source/MGTemplateEngine.m @@ -177,10 +177,16 @@ - (void)reportError:(NSString *)errorStr code:(NSInteger)code continuing:(BOOL)continuing { if (delegate) { - NSString *errStr = NSLocalizedString(errorStr, nil); - if (!continuing) { - errStr = [NSString stringWithFormat:@"%@: %@", NSLocalizedString(@"Fatal Error", nil), errStr]; - } + + NSString *errStr; + if(errorStr) + errStr = [NSString stringWithString:errorStr]; + else + errStr = NSLocalizedString(@"MGTemplateEngine Error", @"mgtemplateengine error"); + + if (!continuing) + errStr = [NSString stringWithFormat:@"%@: %@", NSLocalizedString(@"Fatal Error", @"fatal error"), errStr]; + SEL selector = @selector(templateEngine:encounteredError:isContinuing:); if ([(NSObject *)delegate respondsToSelector:selector]) { NSError *error = [NSError errorWithDomain:TEMPLATE_ENGINE_ERROR_DOMAIN |