Merge pull request Yink#46 from alexsh/master

Add Locale support include region code and variants. Thank you for your work!
jeluchu · Oct 19, 2017 · 57935ef · 57935ef
2 parents edde9f8 + 4d4e89b
commit 57935ef
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/app/src/main/java/com/example/yink/amadeus/LangContext.java b/app/src/main/java/com/example/yink/amadeus/LangContext.java
@@ -24,10 +24,20 @@ public static ContextWrapper wrap(Context context) {
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
 
         String lang = settings.getString("lang", "en");
-
-        Locale locale = new Locale(lang);
+        String[] langArr = lang.split("-");
+        Locale locale;
+        switch(langArr.length){
+            case 3:
+                locale = new Locale(langArr[0],langArr[1], langArr[2]);
+                break;
+            case 2:
+                locale = new Locale(langArr[0],langArr[1]);
+                break;
+            default:
+                locale = new Locale(langArr[0]);
+                break;
+        }
         Locale.setDefault(locale);
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             setSystemLocale(config, locale);
         } else {