From bdd48629c612f38a0d44771359ddab86d521a9fc Mon Sep 17 00:00:00 2001 From: Rashad Sookram Date: Tue, 21 Dec 2021 15:01:33 -0500 Subject: [PATCH] Use localized AM/PM strings. --- .../main/java/org/thoughtcrime/securesms/util/DateUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java index 0e3a8785e6..dd5bb0f9b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java @@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.R; import java.text.DateFormatSymbols; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.Locale; import java.util.concurrent.TimeUnit; @@ -206,7 +207,7 @@ public class DateUtils extends android.text.format.DateUtils { private static @NonNull SimpleDateFormat setLowercaseAmPmStrings(@NonNull SimpleDateFormat format, @NonNull Locale locale) { DateFormatSymbols symbols = new DateFormatSymbols(locale); - symbols.setAmPmStrings(new String[] { "am", "pm"}); + symbols.setAmPmStrings(Arrays.stream(symbols.getAmPmStrings()).map(s -> s.toLowerCase(locale)).toArray(String[]::new)); format.setDateFormatSymbols(symbols); return format;