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

Commit 2135ea67 authored by Annie Chin's avatar Annie Chin
Browse files

Use plural to express minute vs. minutes for snooze length. 

Bug: 21745826
Change-Id: I80cbbf99ab772f900eebdf68d28c4bc58e33b859
parent 55ff960b

res/values/strings.xml

+7 −1
Original line number Diff line number Diff line
@@ -239,7 +239,13 @@ 
    <string name="auto_silence_title">Silence after</string>



    <!-- Auto silence summary string set based on the preference value. -->

    <string name="auto_silence_summary"><xliff:g id="minutes">%d</xliff:g> minutes</string>

    <plurals name="auto_silence_summary">

        <!-- Duration for one minute -->

        <item quantity="one">1 minute</item>

        <!-- Duration for more than one minute -->

        <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> minutes</item>

    </plurals>





    <!-- Auto silence summary when turned off -->

    <string name="auto_silence_never">Never</string>

src/com/android/deskclock/SettingsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -226,7 +226,8 @@ public class SettingsActivity extends BaseActivity { 
            if (i == -1) {

                listPref.setSummary(R.string.auto_silence_never);

            } else {

                listPref.setSummary(getString(R.string.auto_silence_summary, i));

                listPref.setSummary(getResources().getQuantityString(R.plurals.auto_silence_summary,

                        i, i));

            }

        }

src/com/android/deskclock/SnoozeLengthDialog.java

+2 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ package com.android.deskclock; 


import android.app.AlertDialog;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.preference.DialogPreference;

import android.util.AttributeSet;
@@ -91,9 +90,8 @@ public class SnoozeLengthDialog extends DialogPreference { 
    }



    public void setSummary() {

        setSummary(String.format(mContext.getResources()

                .getQuantityText(R.plurals.snooze_duration, mSnoozeMinutes).toString(),

                mSnoozeMinutes));

        setSummary(mContext.getResources().getQuantityString(R.plurals.snooze_duration,

                mSnoozeMinutes, mSnoozeMinutes));

    }



    public int getCurrentValue() {