From 3f0932ff7b95d1a0c4185f034819208b2ab0638d Mon Sep 17 00:00:00 2001 From: McLoo Date: Sun, 14 Dec 2014 13:21:54 +0100 Subject: [PATCH] replace unlocalized 'at' in message details date Making this a string resource has the potential for crashes. Leaving it out completely is a little confusing. The dash is the perfect solution - until a better date formatter is used. Closes #2215 --- src/org/thoughtcrime/securesms/ConversationFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 9260a49c5d..bb4a2a504f 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -205,9 +205,9 @@ public class ConversationFragment extends ListFragment String dateFormatPattern; if (DateFormat.is24HourFormat(getActivity().getApplicationContext())) { - dateFormatPattern = "EEE MMM d, yyyy 'at' HH:mm:ss zzz"; + dateFormatPattern = "EEE MMM d, yyyy '-' HH:mm:ss zzz"; } else { - dateFormatPattern = "EEE MMM d, yyyy 'at' hh:mm:ss a zzz"; + dateFormatPattern = "EEE MMM d, yyyy '-' hh:mm:ss a zzz"; } SimpleDateFormat dateFormatter = new SimpleDateFormat(dateFormatPattern);