aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-06 19:39:55 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-06 19:39:55 +0200
commit3fd371cd53fe49f3ee0d13ba1c3877e974ab4500 (patch)
treecb2a47e2ad8fb1cc1c00486960c903e8d5dd5338
parentfc656c5571a1f10ff64134c11aa4017f4f9a70e1 (diff)
fixed last_seen_now
Diffstat (limited to '')
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/eu/siacs/conversations/utils/UIHelper.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9fcd9dfa..11c5224e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -236,7 +236,7 @@
<string name="hours">hours</string>
<string name="mins">mins</string>
<string name="missing_public_keys">Missing public key announcements</string>
- <string name="last_seen_now">last seen %d ago</string>
+ <string name="last_seen_now">last seen just now</string>
<string name="last_seen_mins">last seen %d minutes ago</string>
<string name="last_seen_hours">last seen %d hours ago</string>
<string name="last_seen_days">last seen %d days ago</string>
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 3d6f4cea..d0ea4828 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -78,7 +78,7 @@ public class UIHelper {
}
long difference = (System.currentTimeMillis() - time) / 1000;
if (difference < 60) {
- return context.getString(R.string.just_now);
+ return context.getString(R.string.last_seen_now);
} else if (difference < 60 * 90) {
return context.getString(R.string.last_seen_mins,difference/60);
} else if (difference < 60 * 60 * 36) {