X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=588ffb7cf07e8f79e1ae19a29168b6261aa45a92;hp=ee1bd1e474a7cb2799634e0831a21f069340a9af;hb=d5cd41949b7e62fdc40ef7390661dcda8c18a139;hpb=49872c388489260aa2e4ecd42dfda1aaebb8d2db

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index ee1bd1e..588ffb7 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -19,9 +19,7 @@ package net.pterodactylus.sone.web;
 
 import static com.google.common.collect.FluentIterable.from;
 import static java.util.logging.Logger.getLogger;
-import static net.pterodactylus.util.template.TemplateParser.parse;
 
-import java.io.StringReader;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -40,30 +38,13 @@ import javax.annotation.Nullable;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.ElementLoader;
-import net.pterodactylus.sone.core.event.ImageInsertAbortedEvent;
-import net.pterodactylus.sone.core.event.ImageInsertFailedEvent;
-import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
-import net.pterodactylus.sone.core.event.ImageInsertStartedEvent;
-import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
-import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
-import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
-import net.pterodactylus.sone.core.event.NewPostFoundEvent;
-import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
-import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
-import net.pterodactylus.sone.core.event.PostRemovedEvent;
-import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
-import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
-import net.pterodactylus.sone.core.event.SoneInsertedEvent;
-import net.pterodactylus.sone.core.event.SoneInsertingEvent;
-import net.pterodactylus.sone.core.event.SoneLockedEvent;
-import net.pterodactylus.sone.core.event.SoneRemovedEvent;
-import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
-import net.pterodactylus.sone.core.event.UpdateFoundEvent;
+import net.pterodactylus.sone.core.event.*;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.L10nFilter;
+import net.pterodactylus.sone.freenet.Translation;
 import net.pterodactylus.sone.main.Loaders;
 import net.pterodactylus.sone.main.PluginHomepage;
 import net.pterodactylus.sone.main.PluginVersion;
@@ -125,7 +106,6 @@ import net.pterodactylus.util.web.TemplatePage;
 import freenet.clients.http.SessionManager;
 import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContext;
-import freenet.l10n.BaseL10n;
 
 import com.codahale.metrics.*;
 import com.google.common.base.Optional;
@@ -178,6 +158,7 @@ public class WebInterface implements SessionProvider {
 
 	private final PageToadletRegistry pageToadletRegistry;
 	private final MetricRegistry metricRegistry;
+	private final Translation translation;
 
 	/** The “new Sone” notification. */
 	private final ListNotification<Sone> newSoneNotification;
@@ -229,7 +210,7 @@ public class WebInterface implements SessionProvider {
 			ParserFilter parserFilter, ShortenFilter shortenFilter,
 			RenderFilter renderFilter,
 			LinkedElementRenderFilter linkedElementRenderFilter,
-			PageToadletRegistry pageToadletRegistry, MetricRegistry metricRegistry) {
+			PageToadletRegistry pageToadletRegistry, MetricRegistry metricRegistry, Translation translation, L10nFilter l10nFilter) {
 		this.sonePlugin = sonePlugin;
 		this.loaders = loaders;
 		this.listNotificationFilter = listNotificationFilter;
@@ -243,9 +224,10 @@ public class WebInterface implements SessionProvider {
 		this.linkedElementRenderFilter = linkedElementRenderFilter;
 		this.pageToadletRegistry = pageToadletRegistry;
 		this.metricRegistry = metricRegistry;
+		this.l10nFilter = l10nFilter;
+		this.translation = translation;
 		formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
 		soneTextParser = new SoneTextParser(getCore(), getCore());
-		l10nFilter = new L10nFilter(getL10n());
 
 		this.templateContextFactory = templateContextFactory;
 		templateContextFactory.addTemplateObject("webInterface", this);
@@ -399,13 +381,8 @@ public class WebInterface implements SessionProvider {
 		return listNotificationFilter.filterNotifications(notificationManager.getNotifications(), currentSone);
 	}
 
-	/**
-	 * Returns the l10n helper of the node.
-	 *
-	 * @return The node’s l10n helper
-	 */
-	public BaseL10n getL10n() {
-		return sonePlugin.l10n().getBase();
+	public Translation getTranslation() {
+		return translation;
 	}
 
 	/**
@@ -616,9 +593,8 @@ public class WebInterface implements SessionProvider {
 		pageToadletRegistry.addPage(new EmptyImageTitlePage(this, loaders, templateRenderer));
 		pageToadletRegistry.addPage(new EmptyAlbumTitlePage(this, loaders, templateRenderer));
 		pageToadletRegistry.addPage(new DismissNotificationPage(this, loaders, templateRenderer));
-		if (getCore().getDebug()) {
-			pageToadletRegistry.addPage(new MetricsPage(this, loaders, templateRenderer, metricRegistry));
-		}
+		pageToadletRegistry.addPage(new DebugPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addDebugPage(new MetricsPage(this, loaders, templateRenderer, metricRegistry));
 		pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("css/", "/static/css/", "text/css"));
 		pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("javascript/", "/static/javascript/", "text/javascript"));
 		pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("images/", "/static/images/", "image/png"));
@@ -982,4 +958,9 @@ public class WebInterface implements SessionProvider {
 		notificationManager.addNotification(imageInsertFailedNotification);
 	}
 
+	@Subscribe
+	public void debugActivated(@Nonnull DebugActivatedEvent debugActivatedEvent) {
+		pageToadletRegistry.activateDebugMode();
+	}
+
 }