X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=7a4c391f36dfe2392a4f6a2eb0143644d2295f87;hb=d003947779cc395170d750b4fa72363ffaf35cd0;hp=afba58f5b46701330db494fdba623f891173e54a;hpb=3da1daa6488c642430858a4baacc0aa986a6ebc1;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java index afba58f..7a4c391 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java @@ -1,5 +1,5 @@ /* - * Sone - GetStatusAjaxPage.java - Copyright © 2010–2015 David Roden + * Sone - GetStatusAjaxPage.java - Copyright © 2010–2016 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,9 +32,10 @@ import java.util.Set; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.notify.PostVisibilityFilter; -import net.pterodactylus.sone.notify.ReplyVisibilityFilter; +import net.pterodactylus.sone.freenet.L10nFilter; import net.pterodactylus.sone.template.SoneAccessor; +import net.pterodactylus.sone.text.TimeText; +import net.pterodactylus.sone.text.TimeTextConverter; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.notify.Notification; @@ -53,6 +54,8 @@ public class GetStatusAjaxPage extends JsonPage { /** Date formatter. */ private static final DateFormat dateFormat = new SimpleDateFormat("MMM d, yyyy, HH:mm:ss"); + private final TimeTextConverter timeTextConverter; + private final L10nFilter l10nFilter; /** * Creates a new “get status” AJAX handler. @@ -60,8 +63,10 @@ public class GetStatusAjaxPage extends JsonPage { * @param webInterface * The Sone web interface */ - public GetStatusAjaxPage(WebInterface webInterface) { + public GetStatusAjaxPage(WebInterface webInterface, TimeTextConverter timeTextConverter, L10nFilter l10nFilter) { super("getStatus.ajax", webInterface); + this.timeTextConverter = timeTextConverter; + this.l10nFilter = l10nFilter; } /** @@ -156,7 +161,8 @@ public class GetStatusAjaxPage extends JsonPage { synchronized (dateFormat) { jsonSone.put("lastUpdated", dateFormat.format(new Date(sone.getTime()))); } - jsonSone.put("lastUpdatedText", GetTimesAjaxPage.getTime(webInterface, sone.getTime()).getText()); + TimeText timeText = timeTextConverter.getTimeText(sone.getTime()); + jsonSone.put("lastUpdatedText", l10nFilter.format(null, timeText.getL10nText(), Collections.emptyMap())); return jsonSone; }