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

Commit c3ff72f5 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 

(cherry-pick of 47a0539e.)

Conflicts:

	core/res/res/values/public.xml

Bug: 6811501
Change-Id: Ifb2e030a9fda85a7f664feac812b63e67780e68f
parent 08153ee0

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

+8 −3
Original line number Diff line number Diff line
@@ -552,14 +552,19 @@ public class DateUtils 
        int days = Math.abs(currentDay - startDay);

        boolean past = (today > day);



        // TODO: some locales name other days too, such as de_DE's "Vorgestern" (today - 2).

        Locale locale = r.getConfiguration().locale;

        if (locale == null) {

            locale = Locale.getDefault();

        }

        if (days == 1) {

            if (past) {

                return r.getString(com.android.internal.R.string.yesterday);

                return LocaleData.get(locale).yesterday;

            } else {

                return r.getString(com.android.internal.R.string.tomorrow);

                return LocaleData.get(locale).tomorrow;

            }

        } else if (days == 0) {

            return r.getString(com.android.internal.R.string.today);

            return LocaleData.get(locale).today;

        }



        int resId;

core/java/android/webkit/DateSorter.java

+10 −2
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ import android.content.res.Resources; 


import java.util.Calendar;

import java.util.Date;

import java.util.Locale;



import libcore.icu.LocaleData;



/**

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



        // build labels

        mLabels[0] = context.getText(com.android.internal.R.string.today).toString();

        mLabels[1] = context.getText(com.android.internal.R.string.yesterday).toString();

        Locale locale = resources.getConfiguration().locale;

        if (locale == null) {

            locale = Locale.getDefault();

        }

        LocaleData localeData = LocaleData.get(locale);

        mLabels[0] = localeData.today;

        mLabels[1] = localeData.yesterday;



        int resId = com.android.internal.R.plurals.last_num_days;

        String format = resources.getQuantityString(resId, NUM_DAYS_AGO);

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

+0 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="yesterday">أمس</string>

    <string name="today">اليوم</string>

    <string name="tomorrow">غدًا</string>



    <string name="hour_minute_24">%-k:%M</string>

    <string name="hour_minute_ampm">%-l:%M %p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %p</string>

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

+0 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="yesterday">أمس</string>

    <string name="today">اليوم</string>

    <string name="tomorrow">غدًا</string>



    <string name="hour_minute_24">%-k:%M</string>

    <string name="hour_minute_ampm">%-l:%M %p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %p</string>

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

+0 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="yesterday">учора</string>

    <string name="today">сёння</string>

    <string name="tomorrow">заўтра</string>



    <string name="hour_minute_24">%-k.%M</string>

    <string name="hour_minute_ampm">%-l.%M %p</string>

    <string name="hour_minute_cap_ampm">%-l.%M %p</string>