From 43e1d452c741ef510cf109c487ce13212a4cb579 Mon Sep 17 00:00:00 2001 From: RiseT Date: Sat, 8 Oct 2016 19:57:49 +0200 Subject: [PATCH] Change DateUtils string 'Now' to 'Just now' Changes the DateUtils string 'Now' to 'Just now' which is a better fit imho. Used for messages in the conversation view that e. g. just have been received. // FREEBIE Closes #5761 --- res/values/strings.xml | 2 +- src/org/thoughtcrime/securesms/util/DateUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 7a8bfb8be3..547f862f7f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -222,7 +222,7 @@ None - Now + Just now %d min diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java index 8179bb01ba..6d12ad4eea 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -48,7 +48,7 @@ public class DateUtils extends android.text.format.DateUtils { public static String getBriefRelativeTimeSpanString(final Context c, final Locale locale, final long timestamp) { if (isWithin(timestamp, 1, TimeUnit.MINUTES)) { - return c.getString(R.string.DateUtils_now); + return c.getString(R.string.DateUtils_just_now); } else if (isWithin(timestamp, 1, TimeUnit.HOURS)) { int mins = convertDelta(timestamp, TimeUnit.MINUTES); return c.getResources().getString(R.string.DateUtils_minutes_ago, mins); @@ -66,7 +66,7 @@ public class DateUtils extends android.text.format.DateUtils { public static String getExtendedRelativeTimeSpanString(final Context c, final Locale locale, final long timestamp) { if (isWithin(timestamp, 1, TimeUnit.MINUTES)) { - return c.getString(R.string.DateUtils_now); + return c.getString(R.string.DateUtils_just_now); } else if (isWithin(timestamp, 1, TimeUnit.HOURS)) { int mins = (int)TimeUnit.MINUTES.convert(System.currentTimeMillis() - timestamp, TimeUnit.MILLISECONDS); return c.getResources().getString(R.string.DateUtils_minutes_ago, mins);