Jelajahi Sumber

Prefix NSString extension

Felix Paul Kühne 9 tahun lalu
induk
melakukan
2d76fb7422

+ 2 - 2
Apple-TV/Playback/Playback Info/VLCPlaybackInfoSubtitlesFetcherViewController.m

@@ -44,7 +44,7 @@
         if ([preferredLanguage containsString:@"-"]) {
             preferredLanguage = [[preferredLanguage componentsSeparatedByString:@"-"] firstObject];
         }
-        selectedLocale = [preferredLanguage threeLetterLanguageKeyForTwoLetterCode];
+        selectedLocale = [preferredLanguage VLCthreeLetterLanguageKeyForTwoLetterCode];
         /* last resort */
         if (selectedLocale == nil) {
             selectedLocale = @"eng";
@@ -155,7 +155,7 @@
     } else {
         NSString *selectedLocale = [[NSUserDefaults standardUserDefaults] objectForKey:kVLCSettingLastUsedSubtitlesSearchLanguage];
         cell.textLabel.text = NSLocalizedString(@"LANGUAGE", nil);
-        NSString *detail = [[selectedLocale twoLetterLanguageKeyForThreeLetterCode] localizedLanguageNameForTwoLetterCode];
+        NSString *detail = [[selectedLocale VLCtwoLetterLanguageKeyForThreeLetterCode] VLClocalizedLanguageNameForTwoLetterCode];
         cell.detailTextLabel.text = detail ? detail : selectedLocale;
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     }

+ 3 - 3
SharedSources/NSString+Locale.h

@@ -13,8 +13,8 @@
 
 @interface NSString (LocaleCodes)
 
-- (NSString *)twoLetterLanguageKeyForThreeLetterCode;
-- (NSString *)threeLetterLanguageKeyForTwoLetterCode;
-- (NSString *)localizedLanguageNameForTwoLetterCode;
+- (NSString *)VLCtwoLetterLanguageKeyForThreeLetterCode;
+- (NSString *)VLCthreeLetterLanguageKeyForTwoLetterCode;
+- (NSString *)VLClocalizedLanguageNameForTwoLetterCode;
 
 @end

+ 3 - 3
SharedSources/NSString+Locale.m

@@ -14,7 +14,7 @@
 
 @implementation NSString (LocaleCodes)
 
-- (NSString *)twoLetterLanguageKeyForThreeLetterCode
+- (NSString *)VLCtwoLetterLanguageKeyForThreeLetterCode
 {
     NSDictionary *searchDict = @{@"alb" : @"sq",
                                  @"ara" : @"ar",
@@ -77,7 +77,7 @@
     return searchDict[self];
 }
 
-- (NSString *)threeLetterLanguageKeyForTwoLetterCode
+- (NSString *)VLCthreeLetterLanguageKeyForTwoLetterCode
 {
     NSDictionary *searchDict = @{@"sq" : @"alb",
                                  @"ar" : @"ara",
@@ -145,7 +145,7 @@
     return searchDict[self];
 }
 
-- (NSString *)localizedLanguageNameForTwoLetterCode
+- (NSString *)VLClocalizedLanguageNameForTwoLetterCode
 {
     return [[NSLocale currentLocale] displayNameForKey:NSLocaleLanguageCode value:self];
 }