Fix for IOS-42, should prefer using the localized info dictionary for…

… getting app name.
apptentive · Jun 3, 2012 · dc2f59e · dc2f59e
1 parent 09a0ec2
commit dc2f59e
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/ApptentiveConnect/source/Rating Flow/ATAppRatingFlow.m b/ApptentiveConnect/source/Rating Flow/ATAppRatingFlow.m
@@ -298,12 +298,24 @@ - (void)postNotification:(NSString *)name forButton:(int)button {
 }
 
 - (NSString *)appName {
-    NSString *displayName = nil;
-    displayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
-    if (!displayName) {
-        displayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleNameKey];
-    }
-    return displayName;
+	NSString *displayName = nil;
+	NSArray *appNameKeys = [NSArray arrayWithObjects:@"CFBundleDisplayName", (NSString *)kCFBundleNameKey, nil];
+	NSMutableArray *infoDictionaries = [NSMutableArray array];
+	if ([[NSBundle mainBundle] localizedInfoDictionary]) {
+		[infoDictionaries addObject:[[NSBundle mainBundle] localizedInfoDictionary]];
+	}
+	if ([[NSBundle mainBundle] infoDictionary]) {
+		[infoDictionaries addObject:[[NSBundle mainBundle] infoDictionary]];
+	}
+	for (NSDictionary *infoDictionary in infoDictionaries) {
+		for (NSString *appNameKey in appNameKeys) {
+			displayName = [infoDictionary objectForKey:appNameKey];
+			if (displayName != nil) {
+				break;
+			}
+		}
+	}
+	return displayName;
 }
 
 - (NSURL *)URLForRatingApp {