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

Commit 9ccf13cd authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix formatDateRange month names for Farsi. 

This removes the LLLs seen in Calendar and Settings, for example.

Bug: 6811327
Change-Id: I87c2ab9ee8d897171ce7ca4fe06cfa8b11d36536
parent 6323b6c6

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

+12 −2
Original line number Diff line number Diff line
@@ -1377,6 +1377,14 @@ public class DateUtils 
        String endMonthDayString = isInstant ? null : endDate.format(MONTH_DAY_FORMAT);

        String endYearString = isInstant ? null : endDate.format(YEAR_FORMAT);



        String startStandaloneMonthString = startMonthString;

        String endStandaloneMonthString = endMonthString;

        // We need standalone months for these strings in Persian (fa): http://b/6811327

        if (!numericDate && !abbrevMonth && Locale.getDefault().getLanguage().equals("fa")) {

            startStandaloneMonthString = startDate.format("%-B");

            endStandaloneMonthString = endDate.format("%-B");

        }



        if (startMonthNum != endMonthNum) {

            // Same year, different month.

            // Example: "October 28 - November 3"
@@ -1397,7 +1405,8 @@ public class DateUtils 
                    startWeekDayString, startMonthString, startMonthDayString,

                    startYearString, startTimeString,

                    endWeekDayString, endMonthString, endMonthDayString,

                    endYearString, endTimeString);

                    endYearString, endTimeString,

                    startStandaloneMonthString, endStandaloneMonthString);

        }



        if (startDay != endDay) {
@@ -1416,7 +1425,8 @@ public class DateUtils 
                    startWeekDayString, startMonthString, startMonthDayString,

                    startYearString, startTimeString,

                    endWeekDayString, endMonthString, endMonthDayString,

                    endYearString, endTimeString);

                    endYearString, endTimeString,

                    startStandaloneMonthString, endStandaloneMonthString);

        }



        // Same start and end day

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

+10 −10
Original line number Diff line number Diff line
@@ -37,22 +37,22 @@ 
    <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 LLLL تا %8$s LLLL</string>

    <string name="same_year_wday1_md1_wday2_md2">%1$s %3$s LLLL تا %6$s %8$s LLLL</string>

    <string name="same_year_md1_time1_md2_time2">%5$s،‏ %3$s LLLL تا %10$s،‏ %8$s LLLL</string>

    <string name="same_month_md1_time1_md2_time2">%5$s،‏ %3$s LLLL تا %10$s،‏ %8$s LLLL</string>

    <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s،‏ %1$s %3$s LLLL تا %10$s،‏ %6$s %8$s LLLL</string>

    <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s،‏ %1$s %3$s LLLL تا %10$s،‏ %6$s %8$s LLLL</string>

    <string name="same_year_md1_md2">%3$s %11$s تا %8$s %12$s</string>

    <string name="same_year_wday1_md1_wday2_md2">%1$s %3$s %11$s تا %6$s %8$s %12$s</string>

    <string name="same_year_md1_time1_md2_time2">%5$s،‏ %3$s %11$s تا %10$s،‏ %8$s %12$s</string>

    <string name="same_month_md1_time1_md2_time2">%5$s،‏ %3$s %11$s تا %10$s،‏ %8$s %12$s</string>

    <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s،‏ %1$s %3$s %11$s تا %10$s،‏ %6$s %8$s %12$s</string>

    <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s،‏ %1$s %3$s %11$s تا %10$s،‏ %6$s %8$s %12$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 %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 LLL</string>

    <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s LLLL تا %6$s %8$s LLLL</string>

    <string name="same_year_mdy1_mdy2">%3$s LLL تا %8$s %2$s %9$s</string>

    <string name="same_month_md1_md2">%3$s تا %8$s %11$s</string>

    <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %11$s تا %6$s %8$s %12$s</string>

    <string name="same_year_mdy1_mdy2">%3$s %11$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 LLL تا %6$s %8$s %2$s %9$s</string>

    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s %11$s تا %6$s %8$s %7$s %9$s</string>

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

    <string name="full_wday_month_day_no_year">E d LLLL</string>

    <string name="abbrev_wday_month_day_no_year">E d LLLL</string>