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

DataHelper: make formatDuration() days to years be monotonic

Browse Source
This commit is contained in:
zzz
2015-06-02 15:36:19 +00:00
parent 1f8408f417
commit f8594c316f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1491,7 +1491,7 @@ 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 * 24 * 60 * 60 * 1000) { } else if (ms < 3L * 365 * 24 * 60 * 60 * 1000) {
return (ms / (24 * 60 * 60 * 1000)) + "d"; return (ms / (24 * 60 * 60 * 1000)) + "d";
} else if (ms < 1000L * 365 * 24 * 60 * 60 * 1000) { } else if (ms < 1000L * 365 * 24 * 60 * 60 * 1000) {
return (ms / (365L * 24 * 60 * 60 * 1000)) + "y"; return (ms / (365L * 24 * 60 * 60 * 1000)) + "y";
@ -1539,7 +1539,7 @@ 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 * 24 * 60 * 60 * 1000) { } else if (ams < 3L * 365 * 24 * 60 * 60 * 1000) {
// 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) { } else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {
@ -1586,7 +1586,7 @@ 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 * 24 * 60 * 60 * 1000) { } else if (ams < 3L * 365 * 24 * 60 * 60 * 1000) {
// 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) { } else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {