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

Commit b432122e authored by Danny Baumann's avatar Danny Baumann Committed by Michael Bestas
Browse files

Don't change nouns in summaries to lower case for German 

In German, nouns are capitalized.

Change-Id: Iff7770c2f1f761fbaccc241c929cf1cf4097cb57
parent 9b81e22e

res/values-de/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="config_backup_settings_label" msgid="1623475653989899715"></string>

    <bool name="language_capitalizes_nouns">true</bool>

</resources>

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -462,4 +462,7 @@ 


    <!-- Whether to show the Preference for Adaptive connectivity -->

    <bool name="config_show_adaptive_connectivity">false</bool>



    <!-- Whether the given language capitalizes nouns -->

    <bool name="language_capitalizes_nouns">false</bool>

</resources>

src/com/android/settings/Utils.java

+7 −0
Original line number Diff line number Diff line
@@ -1170,4 +1170,11 @@ public final class Utils extends com.android.settingslib.Utils { 
        }

        return isMediaOutputDisabled;

    }



    public static String normalizeTitleCaseIfRequired(Context context, String input) {

        if (!context.getResources().getBoolean(R.bool.language_capitalizes_nouns)) {

            return input.toLowerCase();

        }

        return input;

    }

}

src/com/android/settings/applications/AppPermissionsPreferenceController.java

+5 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.BasePreferenceController;

import com.android.settingslib.applications.PermissionsSummaryHelper;
@@ -106,12 +107,12 @@ public class AppPermissionsPreferenceController extends BasePreferenceController 
        CharSequence summary;



        if (!permissionsToShow.isEmpty()) {

            final String formatted = Utils.normalizeTitleCaseIfRequired(mContext,

                    ListFormatter.getInstance().format(permissionsToShow));

            if (isMoreShowed) {

                summary = mContext.getString(R.string.app_permissions_summary_more,

                        ListFormatter.getInstance().format(permissionsToShow).toLowerCase());

                summary = mContext.getString(R.string.app_permissions_summary_more, formatted);

            } else {

                summary = mContext.getString(R.string.app_permissions_summary,

                        ListFormatter.getInstance().format(permissionsToShow).toLowerCase());

                summary = mContext.getString(R.string.app_permissions_summary, formatted);

            }

        } else {

            summary = mContext.getString(