X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePage.kt;h=9734a033ed2d68c8c87e3744b3d1d0be313ff311;hp=b288a4ca062e3a19e5628da9efd9a6343c8c8c09;hb=HEAD;hpb=63c6904d0034dbec520aaf24a2dc0ea435d0107a

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
index b288a4c..86131c3 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -2,6 +2,7 @@ package net.pterodactylus.sone.web.pages
 
 import freenet.clients.http.*
 import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.freenet.*
 import net.pterodactylus.sone.main.*
 import net.pterodactylus.sone.utils.*
 import net.pterodactylus.sone.web.*
@@ -14,20 +15,21 @@ import java.net.*
 /**
  * Base page for the Sone web interface.
  */
-open class SoneTemplatePage @JvmOverloads constructor(
+open class SoneTemplatePage(
 		private val webInterface: WebInterface,
 		loaders: Loaders,
 		templateRenderer: TemplateRenderer,
 		private val pageTitleKey: String? = null,
 		private val requiresLogin: Boolean = false,
-		private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
+		private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.translation::translate) ?: "" }
 ) : FreenetTemplatePage(templateRenderer, loaders, "noPermission.html") {
 
 	private val core = webInterface.core
 	private val sessionProvider: SessionProvider = webInterface
+	protected val translation: Translation = webInterface.translation
 
 	protected fun getCurrentSone(toadletContext: ToadletContext, createSession: Boolean = true) =
-			sessionProvider.getCurrentSone(toadletContext, createSession)
+			sessionProvider.getCurrentSone(toadletContext)
 
 	protected fun setCurrentSone(toadletContext: ToadletContext, sone: Sone?) =
 			sessionProvider.setCurrentSone(toadletContext, sone)
@@ -89,7 +91,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
 	private val String.urlEncode: String get() = URLEncoder.encode(this, "UTF-8")
 
 	override fun isEnabled(toadletContext: ToadletContext) =
-			isEnabled(SoneRequest(toadletContext.uri, Method.GET, HTTPRequestImpl(toadletContext.uri, "GET"), toadletContext, webInterface.l10n, webInterface.sessionManager, core, webInterface))
+			isEnabled(SoneRequest(toadletContext.uri, Method.GET, HTTPRequestImpl(toadletContext.uri, "GET"), toadletContext, core, webInterface))
 
 	open fun isEnabled(soneRequest: SoneRequest) = when {
 		requiresLogin && getCurrentSone(soneRequest.toadletContext) == null -> false