From afb21203b7c303cb7f72ef6b660920ffbf943d97 Mon Sep 17 00:00:00 2001 From: Geonu Kang Date: Wed, 2 Dec 2015 16:35:07 +0900 Subject: [PATCH] Extract "Today" in device list item to string resource Related to #4752 Closes #4780 // FREEBIE --- res/values/strings.xml | 1 + src/org/thoughtcrime/securesms/util/DateUtils.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index ffe495e0ce..46d9a258a0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -208,6 +208,7 @@ Unnamed device Linked %s Last active %s + Today Share with diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java index 830020dd3d..8179bb01ba 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -87,7 +87,7 @@ public class DateUtils extends android.text.format.DateUtils { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); if (simpleDateFormat.format(System.currentTimeMillis()).equals(simpleDateFormat.format(timestamp))) { - return "Today"; + return context.getString(R.string.DeviceListItem_today); } else { String format;