diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-18 16:21:09 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-09-18 16:40:20 -0700 |
| commit | 9ccf13cd6b7c840105fbcd6b2a8bd61d4e634653 (patch) | |
| tree | 1b60f3d2035f235e7603a478f0cd200612f96794 /core/java/android | |
| parent | 6323b6c61775992e400c2d38981332583107c32b (diff) | |
| download | frameworks_base-9ccf13cd6b7c840105fbcd6b2a8bd61d4e634653.zip frameworks_base-9ccf13cd6b7c840105fbcd6b2a8bd61d4e634653.tar.gz frameworks_base-9ccf13cd6b7c840105fbcd6b2a8bd61d4e634653.tar.bz2 | |
Fix formatDateRange month names for Farsi.
This removes the LLLs seen in Calendar and Settings, for example.
Bug: 6811327
Change-Id: I87c2ab9ee8d897171ce7ca4fe06cfa8b11d36536
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/text/format/DateUtils.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index 9e8c5b9..1060bd8 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -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 |