Skip to content

Commit 9ccf13c

Browse files
enh-googleenh-google
committed
Fix formatDateRange month names for Farsi.
This removes the LLLs seen in Calendar and Settings, for example. Bug: 6811327 Change-Id: I87c2ab9ee8d897171ce7ca4fe06cfa8b11d36536
1 parent 6323b6c commit 9ccf13c

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,14 @@ public static Formatter formatDateRange(Context context, Formatter formatter, lo
13771377
String endMonthDayString = isInstant ? null : endDate.format(MONTH_DAY_FORMAT);
13781378
String endYearString = isInstant ? null : endDate.format(YEAR_FORMAT);
13791379

1380+
String startStandaloneMonthString = startMonthString;
1381+
String endStandaloneMonthString = endMonthString;
1382+
// We need standalone months for these strings in Persian (fa): http://b/6811327
1383+
if (!numericDate && !abbrevMonth && Locale.getDefault().getLanguage().equals("fa")) {
1384+
startStandaloneMonthString = startDate.format("%-B");
1385+
endStandaloneMonthString = endDate.format("%-B");
1386+
}
1387+
13801388
if (startMonthNum != endMonthNum) {
13811389
// Same year, different month.
13821390
// Example: "October 28 - November 3"
@@ -1397,7 +1405,8 @@ public static Formatter formatDateRange(Context context, Formatter formatter, lo
13971405
startWeekDayString, startMonthString, startMonthDayString,
13981406
startYearString, startTimeString,
13991407
endWeekDayString, endMonthString, endMonthDayString,
1400-
endYearString, endTimeString);
1408+
endYearString, endTimeString,
1409+
startStandaloneMonthString, endStandaloneMonthString);
14011410
}
14021411

14031412
if (startDay != endDay) {
@@ -1416,7 +1425,8 @@ public static Formatter formatDateRange(Context context, Formatter formatter, lo
14161425
startWeekDayString, startMonthString, startMonthDayString,
14171426
startYearString, startTimeString,
14181427
endWeekDayString, endMonthString, endMonthDayString,
1419-
endYearString, endTimeString);
1428+
endYearString, endTimeString,
1429+
startStandaloneMonthString, endStandaloneMonthString);
14201430
}
14211431

14221432
// Same start and end day

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@
3737
<string name="time_wday_date">%1$s،‏ %2$s %3$s</string>
3838
<string name="wday_date">%2$s %3$s</string>
3939
<string name="time_wday">%1$s،‏ %2$s</string>
40-
<string name="same_year_md1_md2">%3$s LLLL تا %8$s LLLL</string>
41-
<string name="same_year_wday1_md1_wday2_md2">%1$s %3$s LLLL تا %6$s %8$s LLLL</string>
42-
<string name="same_year_md1_time1_md2_time2">%5$s،‏ %3$s LLLL تا %10$s،‏ %8$s LLLL</string>
43-
<string name="same_month_md1_time1_md2_time2">%5$s،‏ %3$s LLLL تا %10$s،‏ %8$s LLLL</string>
44-
<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>
45-
<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>
40+
<string name="same_year_md1_md2">%3$s %11$s تا %8$s %12$s</string>
41+
<string name="same_year_wday1_md1_wday2_md2">%1$s %3$s %11$s تا %6$s %8$s %12$s</string>
42+
<string name="same_year_md1_time1_md2_time2">%5$s،‏ %3$s %11$s تا %10$s،‏ %8$s %12$s</string>
43+
<string name="same_month_md1_time1_md2_time2">%5$s،‏ %3$s %11$s تا %10$s،‏ %8$s %12$s</string>
44+
<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>
45+
<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>
4646
<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>
4747
<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>
4848
<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>
4949
<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>
5050
<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>
51-
<string name="same_month_md1_md2">%3$s تا %8$s LLL</string>
52-
<string name="same_month_wday1_md1_wday2_md2">%1$s %3$s LLLL تا %6$s %8$s LLLL</string>
53-
<string name="same_year_mdy1_mdy2">%3$s LLL تا %8$s %2$s %9$s</string>
51+
<string name="same_month_md1_md2">%3$s تا %8$s %11$s</string>
52+
<string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %11$s تا %6$s %8$s %12$s</string>
53+
<string name="same_year_mdy1_mdy2">%3$s %11$s تا %8$s %7$s %9$s</string>
5454
<string name="same_month_mdy1_mdy2">%3$s تا %8$s %2$s %9$s</string>
55-
<string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s LLL تا %6$s %8$s %2$s %9$s</string>
55+
<string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s %11$s تا %6$s %8$s %7$s %9$s</string>
5656
<string name="short_format_month">%b</string>
5757
<string name="full_wday_month_day_no_year">E d LLLL</string>
5858
<string name="abbrev_wday_month_day_no_year">E d LLLL</string>

0 commit comments

Comments
 (0)