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=d031a00bcfc89bdcb3b6a068d77216dcfaac07db;hb=HEAD;hpb=76f3cee76957a00d6cb8f1ebcef9a2af3be7b603

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 d031a00..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,28 +15,28 @@ import java.net.*
 /**
  * Base page for the Sone web interface.
  */
-open class SoneTemplatePage @JvmOverloads constructor(
-		path: String,
+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) ?: "" }
-) : FreenetTemplatePage(path, templateRenderer, loaders, "noPermission.html") {
+		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)
 
 	fun requiresLogin() = requiresLogin
 
-	override public fun getPageTitle(request: FreenetRequest) = getPageTitle(request.toSoneRequest(core, webInterface))
+	override fun getPageTitle(request: FreenetRequest) = getPageTitle(request.toSoneRequest(core, webInterface))
 
 	open fun getPageTitle(soneRequest: SoneRequest) = pageTitle(soneRequest)
 
@@ -43,7 +44,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
 	override val shortcutIcon = "images/icon.png"
 
-	override public fun getAdditionalLinkNodes(request: FreenetRequest) =
+	override fun getAdditionalLinkNodes(request: FreenetRequest) =
 			listOf(mapOf(
 					"rel" to "search",
 					"type" to "application/opensearchdescription+xml",
@@ -51,7 +52,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
 					"href" to "http://${request.httpRequest.getHeader("host")}/Sone/OpenSearch.xml"
 			))
 
-	final override public fun processTemplate(request: FreenetRequest, templateContext: TemplateContext) {
+	final override fun processTemplate(request: FreenetRequest, templateContext: TemplateContext) {
 		super.processTemplate(request, templateContext)
 		templateContext["preferences"] = core.preferences
 		templateContext["currentSone"] = getCurrentSone(request.toadletContext)
@@ -76,7 +77,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
 	open fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
 	}
 
-	override public fun getRedirectTarget(request: FreenetRequest): String? {
+	override fun getRedirectTarget(request: FreenetRequest): String? {
 		if (requiresLogin && getCurrentSone(request.toadletContext) == null) {
 			val parameters = request.httpRequest.parameterNames
 					.flatMap { name -> request.httpRequest.getMultipleParam(name).map { name to it } }
@@ -90,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