PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Panlingual] Make error message generic.

Browse Source 
Bug: 226032712
Test: local
Change-Id: Ibfdc3d5807df4f8e5f1aa3fd37a8f361624c4129
This commit is contained in:
tom hsu
2022-04-13 19:16:03 +08:00
parent d3c3a2fdff
commit ddbff186f3
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -524,9 +524,6 @@
<!-- Description for the app without any supported languages. [CHAR LIMIT=NONE]--> <!-- 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> <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] --> <!-- 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"> <plurals name="dlg_remove_locales_title">
<item quantity="one">Remove selected language?</item> <item quantity="one">Remove selected language?</item>

8
src/com/android/settings/applications/appinfo/AppLocaleDetails.java
View File

@@ -208,13 +208,9 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
LocaleList packageLocaleList = getPackageLocales(); LocaleList packageLocaleList = getPackageLocales();
String[] assetLocaleList = getAssetLocales(); String[] assetLocaleList = getAssetLocales();
// TODO add apended url string, "Learn more", to these both sentenses. // TODO add apended url string, "Learn more", to these both sentenses.
if (packageLocaleList == null && assetLocaleList.length == 0) { if ((packageLocaleList != null && packageLocaleList.isEmpty())
// There is no locale info from PackageManager amd AssetManager. || (packageLocaleList == null && assetLocaleList.length == 0)) {
return R.string.desc_no_available_supported_locale; 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; return -1;
} }