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

Commit d5b9e52c 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 7c24d22c

res/values-de/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

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

    <string name="config_grayscale_settings_intent" msgid="3834320486271088951"></string>

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

</resources>

res/values/config.xml

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


    <!-- "Show work policy info" intent action. TODO(b/134391103): Replace with final SystemAPI intent when it's available. -->

    <string name="config_work_policy_info_intent_action" translatable="false"/>



    <!-- 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
@@ -1065,4 +1065,11 @@ public final class Utils extends com.android.settingslib.Utils { 
            ActionBarShadowController.attachToView(activity, lifecycle, scrollView);

        }

    }



    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

+10 −5
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;
@@ -102,10 +103,14 @@ public class AppPermissionsPreferenceController extends BasePreferenceController 
        final List<CharSequence> permissionsToShow = mPermissionGroups.stream()

                .limit(NUM_PERMISSIONS_TO_SHOW)

                .collect(Collectors.toList());

        final CharSequence summary = !permissionsToShow.isEmpty()

                ? mContext.getString(R.string.app_permissions_summary,

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

                : null;

        final CharSequence summary;

        if (permissionsToShow.isEmpty()) {

            summary = null;

        } else {

            final String formatted = Utils.normalizeTitleCaseIfRequired(mContext,

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

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

        }

        mPreference.setSummary(summary);

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.preference.Preference; 


import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.applications.AppStorageSettings;

import com.android.settings.applications.FetchPackageStorageAsyncLoader;

import com.android.settingslib.applications.ApplicationsState;
@@ -83,7 +84,7 @@ public class AppStoragePreferenceController extends AppInfoPreferenceControllerB 
                : R.string.storage_type_internal);

        return mContext.getString(R.string.storage_summary_format,

                Formatter.formatFileSize(mContext, stats.getTotalBytes()),

                storageType.toString().toLowerCase());

                Utils.normalizeTitleCaseIfRequired(mContext, storageType.toString()));

    }



    @Override