MacGui: use the native language if available in the subtitles table and languages selection table.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6249 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 6 insertions, 2 deletions

diff --git a/macosx/HBSubtitlesController.m b/macosx/HBSubtitlesController.m
index a804de748..f5c3c4792 100644
--- a/macosx/HBSubtitlesController.m
+++ b/macosx/HBSubtitlesController.m
@@ -124,11 +124,15 @@ NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
                 [forcedSourceNamesArray addObject:subSourceName];
             }
 
+            // Use the native language name if available
+            iso639_lang_t *language = lang_for_code2(subtitle->iso639_2);
+            NSString *nativeLanguage = strlen(language->native_name) ? @(language->native_name) : @(language->eng_name);
+
             /* create a dictionary of source subtitle information to store in our array */
-            [self.subtitleSourceArray addObject:@{keySubTrackName: [NSString stringWithFormat:@"%d: %@ (%@) (%@)", i, @(subtitle->lang), bitmapOrText, subSourceName],
+            [self.subtitleSourceArray addObject:@{keySubTrackName: [NSString stringWithFormat:@"%d: %@ (%@) (%@)", i, nativeLanguage, bitmapOrText, subSourceName],
                                                   keySubTrackIndex: @(i),
                                                   keySubTrackType: @(subtitle->source),
-                                                  keySubTrackLanguage: @(subtitle->lang),
+                                                  keySubTrackLanguage: nativeLanguage,
                                                   keySubTrackLanguageIsoCode: @(subtitle->iso639_2)}];
         }