Skip to content

Commit c3ff72f

Browse files
enh-googleenh-google
committed
Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
(cherry-pick of 47a0539.) Conflicts: core/res/res/values/public.xml Bug: 6811501 Change-Id: Ifb2e030a9fda85a7f664feac812b63e67780e68f
1 parent 08153ee commit c3ff72f

File tree

73 files changed

+18
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+18
-289
lines changed

‎core/java/android/text/format/DateUtils.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,19 @@ private static final String getRelativeDayString(Resources r, long day, long tod
552552
int days = Math.abs(currentDay - startDay);
553553
boolean past = (today > day);
554554

555+
// TODO: some locales name other days too, such as de_DE's "Vorgestern" (today - 2).
556+
Locale locale = r.getConfiguration().locale;
557+
if (locale == null) {
558+
locale = Locale.getDefault();
559+
}
555560
if (days == 1) {
556561
if (past) {
557-
return r.getString(com.android.internal.R.string.yesterday);
562+
return LocaleData.get(locale).yesterday;
558563
} else {
559-
return r.getString(com.android.internal.R.string.tomorrow);
564+
return LocaleData.get(locale).tomorrow;
560565
}
561566
} else if (days == 0) {
562-
return r.getString(com.android.internal.R.string.today);
567+
return LocaleData.get(locale).today;
563568
}
564569

565570
int resId;

‎core/java/android/webkit/DateSorter.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121

2222
import java.util.Calendar;
2323
import java.util.Date;
24+
import java.util.Locale;
25+
26+
import libcore.icu.LocaleData;
2427

2528
/**
2629
* Sorts dates into the following groups:
@@ -63,8 +66,13 @@ public DateSorter(Context context) {
6366
mBins[3] = c.getTimeInMillis(); // One month ago
6467

6568
// build labels
66-
mLabels[0] = context.getText(com.android.internal.R.string.today).toString();
67-
mLabels[1] = context.getText(com.android.internal.R.string.yesterday).toString();
69+
Locale locale = resources.getConfiguration().locale;
70+
if (locale == null) {
71+
locale = Locale.getDefault();
72+
}
73+
LocaleData localeData = LocaleData.get(locale);
74+
mLabels[0] = localeData.today;
75+
mLabels[1] = localeData.yesterday;
6876

6977
int resId = com.android.internal.R.plurals.last_num_days;
7078
String format = resources.getQuantityString(resId, NUM_DAYS_AGO);

‎core/res/res/values-ar-rEG/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">أمس</string>
5-
<string name="today">اليوم</string>
6-
<string name="tomorrow">غدًا</string>
7-
84
<string name="hour_minute_24">%-k:%M</string>
95
<string name="hour_minute_ampm">%-l:%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l:%M %p</string>

‎core/res/res/values-ar/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">أمس</string>
5-
<string name="today">اليوم</string>
6-
<string name="tomorrow">غدًا</string>
7-
84
<string name="hour_minute_24">%-k:%M</string>
95
<string name="hour_minute_ampm">%-l:%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l:%M %p</string>

‎core/res/res/values-be/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">учора</string>
5-
<string name="today">сёння</string>
6-
<string name="tomorrow">заўтра</string>
7-
84
<string name="hour_minute_24">%-k.%M</string>
95
<string name="hour_minute_ampm">%-l.%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l.%M %p</string>

‎core/res/res/values-bg/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">Вчера</string>
5-
<string name="today">Днес</string>
6-
<string name="tomorrow">Утре</string>
7-
84
<string name="hour_minute_24">%-k:%M</string>
95
<string name="hour_minute_ampm">%-l:%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l:%M %p</string>

‎core/res/res/values-ca-rES/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">ahir</string>
5-
<string name="today">avui</string>
6-
<string name="tomorrow">demà</string>
7-
84
<string name="hour_minute_24">%-k:%M</string>
95
<string name="hour_minute_ampm">%-l:%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l:%M %^p</string>

‎core/res/res/values-ca/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">ahir</string>
5-
<string name="today">avui</string>
6-
<string name="tomorrow">demà</string>
7-
84
<string name="hour_minute_24">%-k:%M</string>
95
<string name="hour_minute_ampm">%-l:%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l:%M %^p</string>

‎core/res/res/values-cs/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">Včera</string>
5-
<string name="today">Dnes</string>
6-
<string name="tomorrow">Zítra</string>
7-
84
<string name="hour_minute_24">%-k:%M</string>
95
<string name="hour_minute_ampm">%-l:%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l:%M %^p</string>

‎core/res/res/values-da/donottranslate-cldr.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
4-
<string name="yesterday">i går</string>
5-
<string name="today">i dag</string>
6-
<string name="tomorrow">i morgen</string>
7-
84
<string name="hour_minute_24">%H:%M</string>
95
<string name="hour_minute_ampm">%-l.%M %p</string>
106
<string name="hour_minute_cap_ampm">%-l.%M %^p</string>

0 commit comments

Comments
 (0)