Merge branch 'release-0.6.6'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / GetTimesAjaxPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
index f90806a..31ec399 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
@@ -62,9 +62,8 @@ public class GetTimesAjaxPage extends JsonPage {
                                if (post == null) {
                                        continue;
                                }
-                               long age = now - post.getTime();
                                JsonObject postTime = new JsonObject();
-                               Time time = getTime(age);
+                               Time time = getTime(post.getTime());
                                postTime.put("timeText", time.getText());
                                postTime.put("refreshTime", time.getRefresh() / Time.SECOND);
                                postTime.put("tooltip", dateFormat.format(new Date(post.getTime())));
@@ -113,14 +112,14 @@ public class GetTimesAjaxPage extends JsonPage {
        //
 
        /**
-        * Returns the formatted relative time for a given age.
+        * Returns the formatted relative time for a given time.
         *
-        * @param age
-        *            The age to format (in milliseconds)
+        * @param time
+        *            The time to format the difference from (in milliseconds)
         * @return The formatted age
         */
-       private Time getTime(long age) {
-               return getTime(webInterface, age);
+       private Time getTime(long time) {
+               return getTime(webInterface, time);
        }
 
        //
@@ -128,15 +127,19 @@ public class GetTimesAjaxPage extends JsonPage {
        //
 
        /**
-        * Returns the formatted relative time for a given age.
+        * Returns the formatted relative time for a given time.
         *
         * @param webInterface
         *            The Sone web interface (for l10n access)
-        * @param age
-        *            The age to format (in milliseconds)
+        * @param time
+        *            The time to format the difference from (in milliseconds)
         * @return The formatted age
         */
-       public static Time getTime(WebInterface webInterface, long age) {
+       public static Time getTime(WebInterface webInterface, long time) {
+               if (time == 0) {
+                       return new Time(webInterface.getL10n().getString("View.Sone.Text.UnknownDate"), 12 * Time.HOUR);
+               }
+               long age = System.currentTimeMillis() - time;
                String text;
                long refresh;
                if (age < 0) {
@@ -152,7 +155,7 @@ public class GetTimesAjaxPage extends JsonPage {
                        text = webInterface.getL10n().getString("View.Time.AMinuteAgo");
                        refresh = Time.MINUTE;
                } else if (age < 30 * Time.MINUTE) {
-                       text = webInterface.getL10n().getString("View.Time.XMinutesAgo", "min", String.valueOf((int) Digits.round(age / Time.MINUTE, 1)));
+                       text = webInterface.getL10n().getString("View.Time.XMinutesAgo", "min", String.valueOf((int) (Digits.round(age, Time.MINUTE) / Time.MINUTE)));
                        refresh = 1 * Time.MINUTE;
                } else if (age < 45 * Time.MINUTE) {
                        text = webInterface.getL10n().getString("View.Time.HalfAnHourAgo");
@@ -161,31 +164,31 @@ public class GetTimesAjaxPage extends JsonPage {
                        text = webInterface.getL10n().getString("View.Time.AnHourAgo");
                        refresh = Time.HOUR;
                } else if (age < 21 * Time.HOUR) {
-                       text = webInterface.getL10n().getString("View.Time.XHoursAgo", "hour", String.valueOf((int) Digits.round(age / Time.HOUR, 1)));
+                       text = webInterface.getL10n().getString("View.Time.XHoursAgo", "hour", String.valueOf((int) (Digits.round(age, Time.HOUR) / Time.HOUR)));
                        refresh = Time.HOUR;
                } else if (age < 42 * Time.HOUR) {
                        text = webInterface.getL10n().getString("View.Time.ADayAgo");
                        refresh = Time.DAY;
                } else if (age < 6 * Time.DAY) {
-                       text = webInterface.getL10n().getString("View.Time.XDaysAgo", "day", String.valueOf((int) Digits.round(age / Time.DAY, 1)));
+                       text = webInterface.getL10n().getString("View.Time.XDaysAgo", "day", String.valueOf((int) (Digits.round(age, Time.DAY) / Time.DAY)));
                        refresh = Time.DAY;
                } else if (age < 11 * Time.DAY) {
                        text = webInterface.getL10n().getString("View.Time.AWeekAgo");
                        refresh = Time.DAY;
                } else if (age < 4 * Time.WEEK) {
-                       text = webInterface.getL10n().getString("View.Time.XWeeksAgo", "week", String.valueOf((int) Digits.round(age / Time.WEEK, 1)));
+                       text = webInterface.getL10n().getString("View.Time.XWeeksAgo", "week", String.valueOf((int) (Digits.round(age, Time.WEEK) / Time.WEEK)));
                        refresh = Time.DAY;
                } else if (age < 6 * Time.WEEK) {
                        text = webInterface.getL10n().getString("View.Time.AMonthAgo");
                        refresh = Time.DAY;
                } else if (age < 11 * Time.MONTH) {
-                       text = webInterface.getL10n().getString("View.Time.XMonthsAgo", "month", String.valueOf((int) Digits.round(age / Time.MONTH, 1)));
+                       text = webInterface.getL10n().getString("View.Time.XMonthsAgo", "month", String.valueOf((int) (Digits.round(age, Time.MONTH) / Time.MONTH)));
                        refresh = Time.DAY;
                } else if (age < 18 * Time.MONTH) {
                        text = webInterface.getL10n().getString("View.Time.AYearAgo");
                        refresh = Time.WEEK;
                } else {
-                       text = webInterface.getL10n().getString("View.Time.XYearsAgo", "year", String.valueOf((int) Digits.round(age / Time.YEAR, 1)));
+                       text = webInterface.getL10n().getString("View.Time.XYearsAgo", "year", String.valueOf((int) (Digits.round(age, Time.YEAR) / Time.YEAR)));
                        refresh = Time.WEEK;
                }
                return new Time(text, refresh);