echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DataHelper: Add year output to formatDuration()

Browse Source
This commit is contained in:
zzz
2015-05-27 20:48:51 +00:00
parent ab753651b9
commit 042b03d6b8
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/src/net/i2p/data/DataHelper.java
View File

@ -1491,10 +1491,12 @@ public class DataHelper {
return (ms / (60 * 1000)) + "m"; return (ms / (60 * 1000)) + "m";
} else if (ms < 3 * 24 * 60 * 60 * 1000) { } else if (ms < 3 * 24 * 60 * 60 * 1000) {
return (ms / (60 * 60 * 1000)) + "h"; return (ms / (60 * 60 * 1000)) + "h";
} else if (ms > 1000l * 24l * 60l * 60l * 1000l) { } else if (ms < 1000L * 24 * 60 * 60 * 1000) {
return "n/a";
} else {
return (ms / (24 * 60 * 60 * 1000)) + "d"; return (ms / (24 * 60 * 60 * 1000)) + "d";
} else if (ms < 1000L * 365 * 24 * 60 * 60 * 1000) {
return (ms / (365L * 24 * 60 * 60 * 1000)) + "y";
} else {
return "n/a";
} }
} }
@ -1537,11 +1539,14 @@ public class DataHelper {
// hours // hours
// alternates: hrs, hr., hrs. // alternates: hrs, hr., hrs.
t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000))); t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
} else if (ams > 1000l * 24l * 60l * 60l * 1000l) { } else if (ams < 1000L * 24 * 60 * 60 * 1000) {
return _("n/a");
} else {
// days // days
t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000))); t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
} else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {
// years
t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
} else {
return _("n/a");
} }
// Replace minus sign to work around // Replace minus sign to work around
// bug in Chrome (and IE?), line breaks at the minus sign // bug in Chrome (and IE?), line breaks at the minus sign
@ -1581,10 +1586,14 @@ public class DataHelper {
t = ngettext("1 min", "{0} min", (int) (ms / (60 * 1000))); t = ngettext("1 min", "{0} min", (int) (ms / (60 * 1000)));
} else if (ams < 2 * 24 * 60 * 60 * 1000) { } else if (ams < 2 * 24 * 60 * 60 * 1000) {
t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000))); t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
} else if (ams > 1000l * 24l * 60l * 60l * 1000l) { } else if (ams < 1000L * 24 * 60 * 60 * 1000) {
return _("n/a"); // days
} else {
t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000))); t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
} else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {
// years
t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
} else {
return _("n/a");
} }
if (ms < 0) if (ms < 0)
t = t.replace("-", "&minus;"); t = t.replace("-", "&minus;");