1
0
mirror of https://github.com/etesync/android synced 2024-12-23 07:08:16 +00:00

Event invites: don't hardcode the locale when formatting time.

This commit is contained in:
Tom Hacohen 2018-12-05 14:58:26 +00:00
parent c91d0cbcec
commit cd58a6bcac

View File

@ -223,7 +223,7 @@ public class CalendarSyncManager extends SyncManager {
} }
private static String formatEventDates(Event event) { private static String formatEventDates(Event event) {
final Locale locale = Locale.US; final Locale locale = Locale.getDefault();
final String dateFormatString = final String dateFormatString =
event.isAllDay() ? "EEEE, MMM dd" : "EEEE, MMM dd @ hh:mm a"; event.isAllDay() ? "EEEE, MMM dd" : "EEEE, MMM dd @ hh:mm a";
final DateFormat dateFormat = final DateFormat dateFormat =
@ -246,7 +246,7 @@ public class CalendarSyncManager extends SyncManager {
return sameDay ? return sameDay ?
String.format("%s - %s (%s)", String.format("%s - %s (%s)",
dateFormat.format(startDate), dateFormat.format(startDate),
new SimpleDateFormat("hh:mm a", Locale.US).format(endDate), new SimpleDateFormat("hh:mm a", locale).format(endDate),
tzName) : tzName) :
String.format("%s - %s (%s)", dateFormat.format(startDate), dateFormat.format(endDate), tzName); String.format("%s - %s (%s)", dateFormat.format(startDate), dateFormat.format(endDate), tzName);
} }