am 77dcf735: Merge change 4561 into donut
Merge commit '77dcf735ff3115ef20244408313823d489d88143' * commit '77dcf735ff3115ef20244408313823d489d88143': Work around the Czech lack of abbreviated month names.
This commit is contained in:
committed by
The Android Open Source Project
commit
f8cd5d9988
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user