oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Extract "Today" in device list item to string resource 

Related to #4752
Closes #4780
// FREEBIE
This commit is contained in:
Geonu Kang 2015-12-02 16:35:07 +09:00 committed by Moxie Marlinspike
parent d0a65f86f5
commit afb21203b7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -208,6 +208,7 @@
<string name="DeviceListItem_unnamed_device">Unnamed device</string>
<string name="DeviceListItem_linked_s">Linked %s</string>
<string name="DeviceListItem_last_active_s">Last active %s</string>
<string name="DeviceListItem_today">Today</string>
<!-- ShareActivity -->
<string name="ShareActivity_share_with">Share with</string>

2
src/org/thoughtcrime/securesms/util/DateUtils.java
View File

@ -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;