From 0e77d99fc6f219a82943ec84e8b3ffdeacaddb03 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 1 Jan 2020 20:48:29 -0500 Subject: [PATCH] Fix 24h timestamps when language is Japanese Closes #1547 --- .../main/java/com/moez/QKSMS/common/util/DateFormatter.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt index 00974bbc..d4628c58 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt @@ -39,7 +39,10 @@ class DateFormatter @Inject constructor(val context: Context) { var formattedPattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), pattern) if (DateFormat.is24HourFormat(context)) { - formattedPattern = formattedPattern.replace("h", "HH").replace(" a".toRegex(), "") + formattedPattern = formattedPattern + .replace("h", "HH") + .replace("K", "HH") + .replace(" a".toRegex(), "") } return SimpleDateFormat(formattedPattern, Locale.getDefault())