本地化问题

语言字符串截取的严谨判断
CoderMJLee · Jun 14, 2016 · 4e7ead8 · soundtravel · Jun 15, 2016 · 4e7ead8
1 parent b28ed99
commit 4e7ead8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/MJRefresh.podspec b/MJRefresh.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'MJRefresh'
-    s.version      = '3.1.3'
+    s.version      = '3.1.4'
     s.summary      = 'An easy way to use pull-to-refresh'
     s.homepage     = 'https://github.com/CoderMJLee/MJRefresh'
     s.license      = 'MIT'

diff --git a/MJRefresh/Base/MJRefreshComponent.m b/MJRefresh/Base/MJRefreshComponent.m
@@ -147,7 +147,9 @@ - (NSString *)localizedStringForKey:(NSString *)key withDefault:(NSString *)defa
         // 如果是iOS9以上，截取前面的语言标识
         if ([UIDevice currentDevice].systemVersion.floatValue >= 9.0) {
             NSRange range = [language rangeOfString:@"-" options:NSBackwardsSearch];
-            language = [language substringToIndex:range.location];
+            if (range.location != NSNotFound) {
+                language = [language substringToIndex:range.location];
+            }
         }
 
         if (language.length == 0) {