Merge pull request #1234 from pjrobertson/localFix

Fall back to the English defaultsMap file if no localisation file can be found. Fixes #1233
quicksilver · Nov 21, 2012 · de38fc1 · de38fc1
2 parents 8d93c09 + a25219e
commit de38fc1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Quicksilver/Code-App/QSAdvancedPrefPane.m b/Quicksilver/Code-App/QSAdvancedPrefPane.m
@@ -42,7 +42,12 @@ - (IBAction)setValueFromMenu:(id)sender {
 #endif
 
 - (NSArray *)prefSets {
-	return [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DefaultsMap" ofType:@"plist"]];
+    NSString *defaultsMapPath = [[NSBundle mainBundle] pathForResource:@"DefaultsMap" ofType:@"plist"];
+    // fall back to the English file if no localisation can be found
+    if (!defaultsMapPath) {
+        defaultsMapPath = [[NSBundle mainBundle] pathForResource:@"DefaultsMap" ofType:@"plist" inDirectory:nil forLocalization:@"en"];
+    }
+	return [NSArray arrayWithContentsOfFile:defaultsMapPath];
 }
 
 - (CGFloat) tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row {