Commit cb1042c2 authored by yuzheng's avatar yuzheng

修复setPreferredLanguage仅支持4种语言的问题

parent c6573b33
...@@ -1024,6 +1024,10 @@ ...@@ -1024,6 +1024,10 @@
@end @end
@interface TZImagePickerConfig ()
@property (strong, nonatomic) NSSet *supportedLanguages;
@end
@implementation TZImagePickerConfig @implementation TZImagePickerConfig
+ (instancetype)sharedInstance { + (instancetype)sharedInstance {
...@@ -1032,6 +1036,7 @@ ...@@ -1032,6 +1036,7 @@
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
if (config == nil) { if (config == nil) {
config = [[TZImagePickerConfig alloc] init]; config = [[TZImagePickerConfig alloc] init];
config.supportedLanguages = [NSSet setWithObjects:@"zh-Hans", @"zh-Hant", @"en", @"ar", @"bg", @"cs-CZ", @"de", @"el", @"es", @"fr", @"he", @"it", @"ja", @"ko-KP", @"ko", @"nl", @"pl", @"pt", @"ro", @"ru", @"sk", @"sv", @"th", @"tr", @"uk", @"vi", nil];
config.preferredLanguage = nil; config.preferredLanguage = nil;
config.gifPreviewMaxImagesCount = 50; config.gifPreviewMaxImagesCount = 50;
} }
...@@ -1045,16 +1050,16 @@ ...@@ -1045,16 +1050,16 @@
if (!preferredLanguage || !preferredLanguage.length) { if (!preferredLanguage || !preferredLanguage.length) {
preferredLanguage = [NSLocale preferredLanguages].firstObject; preferredLanguage = [NSLocale preferredLanguages].firstObject;
} }
if ([preferredLanguage rangeOfString:@"zh-Hans"].location != NSNotFound) {
preferredLanguage = @"zh-Hans"; NSString *usedLanguage = @"en";
} else if ([preferredLanguage rangeOfString:@"zh-Hant"].location != NSNotFound) { for (NSString *language in self.supportedLanguages) {
preferredLanguage = @"zh-Hant"; if ([preferredLanguage hasPrefix:language]) {
} else if ([preferredLanguage rangeOfString:@"vi"].location != NSNotFound) { usedLanguage = language;
preferredLanguage = @"vi"; break;
} else { }
preferredLanguage = @"en";
} }
_languageBundle = [NSBundle bundleWithPath:[[NSBundle tz_imagePickerBundle] pathForResource:preferredLanguage ofType:@"lproj"]]; _languageBundle = [NSBundle bundleWithPath:[[NSBundle tz_imagePickerBundle] pathForResource:usedLanguage ofType:@"lproj"]];
} }
@end @end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment