From b8811b9fb823bc367da54be4fa1671ba0ec36257 Mon Sep 17 00:00:00 2001 From: Aaron Grider Date: Thu, 7 Jan 2021 15:15:17 -0800 Subject: [PATCH 1/2] Use new Android locale api --- .../react/modules/i18nmanager/I18nManagerModule.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java index 767900d3d001..93383203f352 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java @@ -13,6 +13,7 @@ import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.common.MapBuilder; import com.facebook.react.module.annotations.ReactModule; +import android.os.Build; import java.util.Locale; import java.util.Map; @@ -36,7 +37,12 @@ public String getName() { @Override public Map getTypedExportedConstants() { final Context context = getReactApplicationContext(); - final Locale locale = context.getResources().getConfiguration().locale; + final Locale locale; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + locale = context.getResources().getConfiguration().getLocales().get(0); + } else { + locale = context.getResources().getConfiguration().locale; + } final Map constants = MapBuilder.newHashMap(); constants.put("isRTL", sharedI18nUtilInstance.isRTL(context)); From ac2adbdd09770375ca2206d5dd12123a0930b694 Mon Sep 17 00:00:00 2001 From: Aaron Grider Date: Thu, 7 Jan 2021 16:09:01 -0800 Subject: [PATCH 2/2] Reorder imports --- .../facebook/react/modules/i18nmanager/I18nManagerModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java index 93383203f352..c2c54b93df4b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java @@ -8,12 +8,12 @@ package com.facebook.react.modules.i18nmanager; import android.content.Context; +import android.os.Build; import com.facebook.fbreact.specs.NativeI18nManagerSpec; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.common.MapBuilder; import com.facebook.react.module.annotations.ReactModule; -import android.os.Build; import java.util.Locale; import java.util.Map;