Skip to content

Commit 18bb900

Browse files
authored
Merge pull request #4672 from wordpress-mobile/feature/reader-full-post-refresh-master
Reader Full Post Refresh Design Review
2 parents b105bf5 + 4419c47 commit 18bb900

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

WordPressUtils/src/main/java/org/wordpress/android/util/DateTimeUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ public static String javaDateToTimeSpan(final Date date, Context context) {
4444
// less than an hour (ex: 12m)
4545
long minutesSince = secondsSince / 60;
4646
if (minutesSince < 60) {
47-
return Long.toString(minutesSince) + "m";
47+
return Long.toString(minutesSince) + "m " + context.getString(R.string.timespan_ago);
4848
}
4949

5050
// less than a day (ex: 17h)
5151
long hoursSince = minutesSince / 60;
5252
if (hoursSince < 24) {
53-
return Long.toString(hoursSince) + "h";
53+
return Long.toString(hoursSince) + "h " + context.getString(R.string.timespan_ago);
5454
}
5555

5656
// less than a week (ex: 5d)
5757
long daysSince = hoursSince / 24;
5858
if (daysSince < 7) {
59-
return Long.toString(daysSince) + "d";
59+
return Long.toString(daysSince) + "d " + context.getString(R.string.timespan_ago);
6060
}
6161

6262
// less than a year old, so return day/month without year (ex: Jan 30)

WordPressUtils/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<resources>
33
<string name="no_network_message">There is no network available</string>
44
<string name="timespan_now">Now</string>
5+
<string name="timespan_ago">ago</string>
56
</resources>

0 commit comments

Comments
 (0)