Merge pull request #186 from pilot4u/patch-1

fix android generating old language code for ISO 639
AlexanderZaytsev · Jul 12, 2018 · dcfd1c2 · dcfd1c2
2 parents ba46f47 + 9c4f16d
commit dcfd1c2
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/android/src/main/java/com/AlexanderZaytsev/RNI18n/RNI18nModule.java b/android/src/main/java/com/AlexanderZaytsev/RNI18n/RNI18nModule.java
@@ -26,19 +26,24 @@ public String getName() {
   }
 
   private String toLanguageTag(Locale locale) {
+    String langTag;
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      return locale.toLanguageTag();
-    }
+      langTag = locale.toLanguageTag();
+    } else {
+      StringBuilder builder = new StringBuilder();
+      builder.append(locale.getLanguage());
 
-    StringBuilder builder = new StringBuilder();
-    builder.append(locale.getLanguage());
+      if (locale.getCountry() != null) {
+        builder.append("-");
+        builder.append(locale.getCountry());
+      }
 
-    if (locale.getCountry() != null) {
-      builder.append("-");
-      builder.append(locale.getCountry());
+      langTag = builder.toString();
     }
-
-    return builder.toString();
+    if (langTag.matches("^(iw|in|ji).*")){
+      return langTag.replace("iw","he").replace("in","id").replace("ji","yi");
+    }
+    return langTag;
   }
 
   private WritableArray getLocaleList() {