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

Commit 8e18d88c authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am b11e670e: Merge change 3754 into donut 

Merge commit 'b11e670e'

* commit 'b11e670e':
  Fix some 12- vs 24-hour problems in the FormatDateRange strings.
parents 1b040762 b11e670e

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

+18 −6
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ public class DateUtils 
    public static final long HOUR_IN_MILLIS = MINUTE_IN_MILLIS * 60;

    public static final long DAY_IN_MILLIS = HOUR_IN_MILLIS * 24;

    public static final long WEEK_IN_MILLIS = DAY_IN_MILLIS * 7;

    /**

     * This constant is actually the length of 364 days, not of a year!

     */

    public static final long YEAR_IN_MILLIS = WEEK_IN_MILLIS * 52;



    // The following FORMAT_* symbols are used for specifying the format of
@@ -176,6 +179,9 @@ public class DateUtils 


    // Date and time format strings that are constant and don't need to be

    // translated.

    /**

     * This is not actually the preferred 24-hour date format in all locales.

     */

    public static final String HOUR_MINUTE_24 = "%H:%M";

    public static final String MONTH_FORMAT = "%B";

    public static final String ABBREV_MONTH_FORMAT = "%b";
@@ -1106,7 +1112,9 @@ public class DateUtils 
     * 

     * <p>

     * If FORMAT_CAP_AMPM is set and 12-hour time is used, then the "AM"

     * and "PM" are capitalized.

     * and "PM" are capitalized.  You should not use this flag

     * because in some locales these terms cannot be capitalized, and in

     * many others it doesn't make sense to do so even though it is possible.

     * 

     * <p>

     * If FORMAT_NO_NOON is set and 12-hour time is used, then "12pm" is
@@ -1114,15 +1122,19 @@ public class DateUtils 
     * 

     * <p>

     * If FORMAT_CAP_NOON is set and 12-hour time is used, then "Noon" is

     * shown instead of "noon".

     * shown instead of "noon".  You should probably not use this flag

     * because in many locales it will not make sense to capitalize

     * the term.

     * 

     * <p>

     * If FORMAT_NO_MIDNIGHT is set and 12-hour time is used, then "12am" is

     * shown instead of "midnight".

     * 

     * <p>

     * If FORMAT_CAP_NOON is set and 12-hour time is used, then "Midnight" is

     * shown instead of "midnight".

     * If FORMAT_CAP_MIDNIGHT is set and 12-hour time is used, then "Midnight"

     * is shown instead of "midnight".  You should probably not use this

     * flag because in many locales it will not make sense to capitalize

     * the term.

     * 

     * <p>

     * If FORMAT_12HOUR is set and the time is shown, then the time is
@@ -1264,8 +1276,8 @@ public class DateUtils 
                use24Hour = DateFormat.is24HourFormat(context);

            }

            if (use24Hour) {

                startTimeFormat = HOUR_MINUTE_24;

                endTimeFormat = HOUR_MINUTE_24;

                startTimeFormat = endTimeFormat =

                    res.getString(com.android.internal.R.string.hour_minute_24);

            } else {

                boolean abbrevTime = (flags & (FORMAT_ABBREV_TIME | FORMAT_ABBREV_ALL)) != 0;

                boolean capAMPM = (flags & FORMAT_CAP_AMPM) != 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -91,8 +91,9 @@ 
    <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>

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

    <string name="numeric_date">%-e‏/%-m‏/%Y</string>

    <string name="numeric_date_format">d‏/M‏/yyyy</string>

    <string name="month_day_year">%-e %B، %Y</string>

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

+3 −2
Original line number Diff line number Diff line
@@ -91,8 +91,9 @@ 
    <string name="today">Днес</string>

    <string name="tomorrow">Утре</string>



    <string name="hour_minute_ampm">%H:%M</string>

    <string name="hour_minute_cap_ampm">%H:%M</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>

    <string name="numeric_date">%d.%m.%Y</string>

    <string name="numeric_date_format">dd.MM.yyyy</string>

    <string name="month_day_year">%d %B %Y</string>

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

+3 −2
Original line number Diff line number Diff line
@@ -91,8 +91,9 @@ 
    <string name="today">avui</string>

    <string name="tomorrow">demà</string>



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

    <string name="hour_minute_cap_ampm">%-k:%M</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>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

    <string name="month_day_year">%-e de %B de %Y</string>

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

+3 −2
Original line number Diff line number Diff line
@@ -91,8 +91,9 @@ 
    <string name="today">Dnes</string>

    <string name="tomorrow">Zítra</string>



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

    <string name="hour_minute_cap_ampm">%-k:%M</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>

    <string name="numeric_date">%-e.%-m.%Y</string>

    <string name="numeric_date_format">d.M.yyyy</string>

    <string name="month_day_year">%-e. %B %Y</string>