Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e7de8ce authored by Igor Viarheichyk's avatar Igor Viarheichyk Committed by Android (Google) Code Review
Browse files

Merge "Fix translations detection for BCP 47 locales."

parents 62dff60c 6a29b497

core/java/com/android/internal/app/LocaleStore.java

+5 −1
Original line number Diff line number Diff line
@@ -146,7 +146,11 @@ public class LocaleStore { 


        private String getLangScriptKey() {

            if (mLangScriptKey == null) {

                Locale parentWithScript = getParent(LocaleHelper.addLikelySubtags(mLocale));

                Locale baseLocale = new Locale.Builder()

                    .setLocale(mLocale)

                    .setExtension(Locale.UNICODE_LOCALE_EXTENSION, "")

                    .build();

                Locale parentWithScript = getParent(LocaleHelper.addLikelySubtags(baseLocale));

                mLangScriptKey =

                        (parentWithScript == null)

                        ? mLocale.toLanguageTag()