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

Commit ee6d283b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Panlingual] Make error message generic." into tm-dev

parents e9e6a008 ddbff186

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -524,9 +524,6 @@ 
    <!-- Description for the app without any supported languages. [CHAR LIMIT=NONE]-->

    <string name="desc_no_available_supported_locale">Language selection for this app isn\u2019t available from Settings.</string>









    <!-- Description for the app without any supported languages. [CHAR LIMIT=NONE]-->









    <string name="desc_disallow_locale_change_in_settings">You can\u2019t select a language for this app from Settings.</string>

















    <!-- The title of the confirmation dialog shown when the user selects one / several languages and tries to remove them [CHAR LIMIT=60] -->









    <plurals name="dlg_remove_locales_title">









        <item quantity="one">Remove selected language?</item>

























src/com/android/settings/applications/appinfo/AppLocaleDetails.java



+2
−6






























Original line number
Diff line number
Diff line







@@ -208,13 +208,9 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {







        LocaleList packageLocaleList = getPackageLocales();









        String[] assetLocaleList = getAssetLocales();









        // TODO add apended url string, "Learn more", to these both sentenses.









        if (packageLocaleList == null && assetLocaleList.length == 0) {









            // There is no locale info from PackageManager amd AssetManager.









        if ((packageLocaleList != null && packageLocaleList.isEmpty())









                || (packageLocaleList == null && assetLocaleList.length == 0)) {









            return R.string.desc_no_available_supported_locale;









        } else if (packageLocaleList != null && packageLocaleList.isEmpty()) {









            // LocaleConfig is empty, and this means only allow user modify language









            // by the application.









            return R.string.desc_disallow_locale_change_in_settings;









        }









        return -1;









    }