🐛 Restore ability to change languages on-the-fly

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / main / SoneModule.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
index 749de0d..a4533c5 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
@@ -7,18 +7,20 @@ import com.google.inject.*
 import com.google.inject.matcher.*
 import com.google.inject.name.Names.*
 import com.google.inject.spi.*
+import net.pterodactylus.sone.core.SoneUriCreator
 import net.pterodactylus.sone.database.*
 import net.pterodactylus.sone.database.memory.*
 import net.pterodactylus.sone.freenet.*
 import net.pterodactylus.sone.freenet.wot.*
+import net.pterodactylus.sone.web.FreenetSessionProvider
+import net.pterodactylus.sone.web.SessionProvider
 import net.pterodactylus.util.config.*
 import net.pterodactylus.util.config.ConfigurationException
-import net.pterodactylus.util.logging.*
 import net.pterodactylus.util.version.Version
 import java.io.*
 import java.util.concurrent.*
 import java.util.concurrent.Executors.*
-import java.util.logging.*
+import java.util.logging.Logger
 import javax.inject.*
 import javax.inject.Singleton
 
@@ -56,11 +58,13 @@ open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus:
                bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year))
                bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage))
                bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java)
-               bind(Translation::class.java).toInstance(BaseL10nTranslation(sonePlugin.l10n().base))
+               bind(Translation::class.java).toInstance(BaseL10nTranslation { sonePlugin.l10n().base })
                loaders?.let { bind(Loaders::class.java).toInstance(it) }
                bind(MetricRegistry::class.java).`in`(Singleton::class.java)
                bind(WebOfTrustConnector::class.java).to(PluginWebOfTrustConnector::class.java).`in`(Singleton::class.java)
                bind(TickerShutdown::class.java).`in`(Singleton::class.java)
+               bind(SoneUriCreator::class.java).`in`(Singleton::class.java)
+               bind(SessionProvider::class.java).to(FreenetSessionProvider::class.java).`in`(Singleton::class.java)
 
                bindListener(Matchers.any(), object : TypeListener {
                        override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
@@ -78,7 +82,7 @@ open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus:
        fun getNotificationTicker(): ScheduledExecutorService =
                        newSingleThreadScheduledExecutor()
 
-       private val logger: Logger = Logging.getLogger(javaClass)
+       private val logger: Logger = Logger.getLogger(javaClass.name)
 
 }