diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings index feeb93216..438ef0379 100644 Binary files a/macosx/English.lproj/Localizable.strings and b/macosx/English.lproj/Localizable.strings differ diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m index 9fb1a9564..f11934913 100644 --- a/macosx/MessageWindowController.m +++ b/macosx/MessageWindowController.m @@ -330,12 +330,9 @@ level = @""; } - NSString * fileString, * file = [message objectForKey: @"File"]; - if ((file = [message objectForKey: @"File"])) - fileString = [NSString stringWithFormat: @" %@:%d", [message objectForKey: @"File"], - [[message objectForKey: @"Line"] intValue]]; - else - fileString = @""; + NSString * file = [message objectForKey: @"File"], + * fileString = file ? [NSString stringWithFormat: @" %@:%@", [message objectForKey: @"File"], [message objectForKey: @"Line"]] + : @""; return [NSString stringWithFormat: @"%@%@ [%@] %@", [message objectForKey: @"Date"], fileString, level, [message objectForKey: @"Message"]];