From cd58a6bcac0271ba9ed8b0a2e0cefae5a69937e2 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 5 Dec 2018 14:58:26 +0000 Subject: [PATCH] Event invites: don't hardcode the locale when formatting time. --- .../etesync/syncadapter/syncadapter/CalendarSyncManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java index 9f438737..9d38fd58 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java @@ -223,7 +223,7 @@ public class CalendarSyncManager extends SyncManager { } private static String formatEventDates(Event event) { - final Locale locale = Locale.US; + final Locale locale = Locale.getDefault(); final String dateFormatString = event.isAllDay() ? "EEEE, MMM dd" : "EEEE, MMM dd @ hh:mm a"; final DateFormat dateFormat = @@ -246,7 +246,7 @@ public class CalendarSyncManager extends SyncManager { return sameDay ? String.format("%s - %s (%s)", dateFormat.format(startDate), - new SimpleDateFormat("hh:mm a", Locale.US).format(endDate), + new SimpleDateFormat("hh:mm a", locale).format(endDate), tzName) : String.format("%s - %s (%s)", dateFormat.format(startDate), dateFormat.format(endDate), tzName); }