commit 1e6f24ee0b8ea7b6be593fb1c4ef5e2beb134698
author Edna Morales <edna592@gmail.com> Fri Jul 24 16:45:26 2015 -0400
committer Carlos Santana <csantana23@gmail.com> Thu Sep 10 17:37:58 2015 -0400
tree 38289c4c476a8780b00eafb1ec9517e2657ef365
parent ca37f40acd3a08eae8fd9f3613a2eabee3303ebb

CB-9409 check that localeIdentifier has underscore

CB-9409 change the condition checking for underscore. This closes #39

github: close #39

src/ios/CDVGlobalization.m

diff --git a/src/ios/CDVGlobalization.m b/src/ios/CDVGlobalization.m
index 49691a0..7ba1f6f 100644
--- a/src/ios/CDVGlobalization.m
+++ b/src/ios/CDVGlobalization.m
@@ -39,14 +39,17 @@
         //Format to match other devices
         if(language.length <= 2) {
             NSLocale* locale = [NSLocale currentLocale];
-            NSRange underscoreIndex = [[locale localeIdentifier] rangeOfString:@"_" options:NSBackwardsSearch];
-            NSRange atSignIndex = [[locale localeIdentifier] rangeOfString:@"@"];
-            //If localeIdentifier did not contain @, i.e. did not have calendar other than Gregoarian selected
-            if(atSignIndex.length == 0)
-                language = [NSString stringWithFormat:@"%@%@", language, [[locale localeIdentifier] substringFromIndex:underscoreIndex.location]];
-            else {
-                NSRange localeRange = NSMakeRange(underscoreIndex.location, atSignIndex.location-underscoreIndex.location);
-                language = [NSString stringWithFormat:@"%@%@", language, [[locale localeIdentifier] substringWithRange:localeRange]];
+            NSString* localeId = [locale localeIdentifier];
+            NSRange underscoreIndex = [localeId rangeOfString:@"_" options:NSBackwardsSearch];
+            NSRange atSignIndex = [localeId rangeOfString:@"@"];
+            if (underscoreIndex.location != NSNotFound) {
+                //If localeIdentifier did not contain @, i.e. did not have calendar other than Gregoarian selected
+                if(atSignIndex.length == 0)
+                    language = [NSString stringWithFormat:@"%@%@", language, [localeId substringFromIndex:underscoreIndex.location]];
+                else {
+                    NSRange localeRange = NSMakeRange(underscoreIndex.location, atSignIndex.location-underscoreIndex.location);
+                    language = [NSString stringWithFormat:@"%@%@", language, [localeId substringWithRange:localeRange]];
+                }
             }
         }