Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatDateRange month names for Farsi.

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

Bug: 6811327
Change-Id: I87c2ab9ee8d897171ce7ca4fe06cfa8b11d36536
This commit is contained in:
Elliott Hughes
2012-09-18 16:21:09 -07:00
parent 6323b6c617
commit 9ccf13cd6b
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/text/format/DateUtils.java
View File

@@ -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