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

Commit 6a29b497 authored by Igor Viarheichyk's avatar Igor Viarheichyk
Browse files

Fix translations detection for BCP 47 locales. 

Drop BCP 47 unicode locale extension when passing the locale
into ICU ULocale.addLikelySubtags. Currently addLikelySubtags
discards region code for locales with extensions, making them
treated as not translated by Setup Wizard.

Test: manual run with debug logs.
Bug: 72336416

Change-Id: I7258577253486162b310e4102669db082cd09594
parent 4ec3efce

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()