From 3b5f70d38a7e0c6c25a4497560af9eeea5c1704a Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Tue, 17 Dec 2013 16:01:04 +0100 Subject: [PATCH] Make sure that BITHockeyLocalizedString always returns a valid string --- Classes/HockeySDKPrivate.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Classes/HockeySDKPrivate.m b/Classes/HockeySDKPrivate.m index 6307434adf..381fddf894 100644 --- a/Classes/HockeySDKPrivate.m +++ b/Classes/HockeySDKPrivate.m @@ -50,11 +50,16 @@ NSBundle *BITHockeyBundle(void) { } NSString *BITHockeyLocalizedString(NSString *stringToken) { + if (!stringToken) return @""; + NSString *appSpecificLocalizationString = NSLocalizedString(stringToken, @""); if (appSpecificLocalizationString && ![stringToken isEqualToString:appSpecificLocalizationString]) { return appSpecificLocalizationString; } else if (BITHockeyBundle()) { - return NSLocalizedStringFromTableInBundle(stringToken, @"HockeySDK", BITHockeyBundle(), @""); + NSString *bundleSpecificLocalizationString = NSLocalizedStringFromTableInBundle(stringToken, @"HockeySDK", BITHockeyBundle(), @""); + if (bundleSpecificLocalizationString) + return bundleSpecificLocalizationString; + return stringToken; } else { return stringToken; }