Merge pull request #7254 from AngelkPetkov/TIMOB-19566

[TIMOB-19566] iOS-Truncated language string
tidev · Oct 5, 2015 · 4773bb2 · 4773bb2
2 parents a6b1733 + 7f35278
commit 4773bb2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/iphone/Classes/TiLocale.m b/iphone/Classes/TiLocale.m
@@ -7,6 +7,7 @@
 
 #import "TiLocale.h"
 #import "TiBase.h"
+#import "TiUtils.h"
 
 @implementation TiLocale
 
@@ -37,6 +38,11 @@ +(NSString*)defaultLocale
 		NSArray* languages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
 		NSString *preferredLang = [languages objectAtIndex:0];
 		[TiLocale setLocale:preferredLang];
+		NSString *var = [[UIDevice currentDevice] systemVersion];
+		if ([TiUtils isIOS9OrGreater]) {
+			//[TIMOB-19566]:Truncate the current locale for parity between iOS versions
+			[l setCurrentLocale:[[l currentLocale] substringToIndex:2]];
+		}
 	}
 	return l.currentLocale;
 }