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

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

am 77dcf735: Merge change 4561 into donut 

Merge commit '77dcf735'

* commit '77dcf735':
  Work around the Czech lack of abbreviated month names.
parents 366a4088 77dcf735

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

+5 −1
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ public class DateUtils 
     */

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

    public static final String MONTH_FORMAT = "%B";

    /**

     * This is not actually a useful month name in all locales.

     */

    public static final String ABBREV_MONTH_FORMAT = "%b";

    public static final String NUMERIC_MONTH_FORMAT = "%m";

    public static final String MONTH_DAY_FORMAT = "%-d";
@@ -1444,7 +1447,8 @@ public class DateUtils 
        if (numericDate) {

            monthFormat = NUMERIC_MONTH_FORMAT;

        } else if (abbrevMonth) {

            monthFormat = ABBREV_MONTH_FORMAT;

            monthFormat =

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

        } else {

            monthFormat = MONTH_FORMAT;

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -143,4 +143,5 @@ 
    <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s، %9$s</string>

    <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s، %9$s</string>

    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s، %3$s %2$s - %6$s، %8$s %7$s، %9$s</string>

    <string name="short_format_month">%b</string>

</resources>

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

+1 −0
Original line number Diff line number Diff line
@@ -143,4 +143,5 @@ 
    <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string>

    <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string>

    <string name="same_year_wday1_mdy1_wday2_mdy2">%3$s %2$s %9$s, %1$s - %8$s %7$s y, %6$s</string>

    <string name="short_format_month">%b</string>

</resources>

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

+1 −0
Original line number Diff line number Diff line
@@ -143,4 +143,5 @@ 
    <string name="same_year_mdy1_mdy2">%3$s de %2$s - %8$s de %7$s de %9$s</string>

    <string name="same_month_mdy1_mdy2">%3$s-%8$s de %2$s de %9$s</string>

    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s de %2$s - %6$s %8$s de %7$s de %9$s</string>

    <string name="short_format_month">%b</string>

</resources>

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

+15 −14
Original line number Diff line number Diff line
@@ -108,9 +108,9 @@ 
    <string name="month_day">%-e. %B</string>

    <string name="month">%-B</string>

    <string name="month_year">%Y %B</string>

    <string name="abbrev_month_day">%b %-e</string>

    <string name="abbrev_month">%-b</string>

    <string name="abbrev_month_year">%Y %b</string>

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

    <string name="abbrev_month">%-B</string>

    <string name="abbrev_month_year">%-B %Y</string>

    <string name="time1_time2">%1$s - %2$s</string>

    <string name="date1_date2">%2$s - %5$s</string>

    <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string>
@@ -121,26 +121,27 @@ 
    <string name="numeric_md1_time1_md2_time2">%5$s %3$s.%2$s - %10$s %8$s.%7$s</string>

    <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s-%3$s - %10$s %6$s, %7$s-%8$s</string>

    <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s.%2$s.%4$s - %10$s %8$s.%7$s.%9$s</string>

    <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s %2$s - %6$s %4$s %5$s</string>

    <string name="wday1_date1_wday2_date2">%1$s %2$s - %4$s %5$s</string>

    <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string>

    <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string>

    <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string>

    <string name="time_wday_date">%1$s %2$s %3$s</string>

    <string name="wday_date">%2$s %3$s</string>

    <string name="time_wday_date">%1$s %2$s, %3$s</string>

    <string name="wday_date">%2$s, %3$s</string>

    <string name="time_wday">%1$s %2$s</string>

    <string name="same_year_md1_md2">%3$s. %2$s - %8$s. %7$s</string>

    <string name="same_year_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string>

    <string name="same_year_wday1_md1_wday2_md2">%1$s, %3$s. %2$s - %6$s, %8$s. %7$s</string>

    <string name="same_year_md1_time1_md2_time2">%5$s %3$s. %2$s - %10$s %8$s. %7$s</string>

    <string name="same_month_md1_time1_md2_time2">%5$s %3$s. %2$s - %10$s %8$s. %7$s</string>

    <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s %2$s %3$s - %10$s %6$s %7$s %8$s</string>

    <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s %2$s %3$s - %10$s %6$s %7$s %8$s</string>

    <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %3$s. %2$s - %10$s %6$s, %8$s. %7$s</string>

    <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %3$s. %2$s - %10$s %6$s, %8$s. %7$s</string>

    <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s. %2$s %4$s - %10$s %8$s. %7$s %9$s</string>

    <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s. %2$s %4$s - %10$s %8$s. %7$s %9$s</string>

    <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string>

    <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string>

    <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s - %6$s, %9$s %7$s %8$s</string>

    <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string>

    <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string>

    <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s - %6$s, %8$s. %7$s %9$s</string>

    <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string>

    <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string>

    <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s. %2$s - %6$s, %8$s. %7$s</string>

    <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string>

    <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string>

    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s - %6$s, %8$s. %7$s %9$s</string>

    <string name="short_format_month">%B</string>

</resources>