diff options
| -rw-r--r-- | core/java/android/webkit/DateSorter.java | 7 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/core/java/android/webkit/DateSorter.java b/core/java/android/webkit/DateSorter.java index bc13504..0e8ad7e 100644 --- a/core/java/android/webkit/DateSorter.java +++ b/core/java/android/webkit/DateSorter.java @@ -66,13 +66,12 @@ public class DateSorter { mLabels[0] = context.getText(com.android.internal.R.string.today).toString(); mLabels[1] = context.getText(com.android.internal.R.string.yesterday).toString(); - int resId = com.android.internal.R.plurals.num_days_ago; + int resId = com.android.internal.R.plurals.last_num_days; String format = resources.getQuantityString(resId, NUM_DAYS_AGO); mLabels[2] = String.format(format, NUM_DAYS_AGO); - mLabels[3] = context.getText(com.android.internal.R.string.oneMonthDurationPast).toString(); - mLabels[4] = context.getText(com.android.internal.R.string.beforeOneMonthDurationPast) - .toString(); + mLabels[3] = context.getString(com.android.internal.R.string.last_month); + mLabels[4] = context.getString(com.android.internal.R.string.older); } /** diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 98b8863..f1501ae 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1699,6 +1699,17 @@ <item quantity="other"><xliff:g id="count">%d</xliff:g> hours ago</item> </plurals> + <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). --> + <plurals name="last_num_days"> + <item quantity="other">Last <xliff:g id="count">%d</xliff:g> days</item> + </plurals> + + <!-- This is used to express that something has occurred within the last month --> + <string name="last_month">Last month</string> + + <!-- This is used to express that something happened longer ago than the previous options --> + <string name="older">Older</string> + <!-- This is used to express that something occurred some number of days in the past (e.g., 5 days ago). --> <plurals name="num_days_ago"> <item quantity="one">yesterday</item> |