From 9415a3f21760304a42705a939e18ae3155077b1a Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 18 Nov 2024 18:02:15 +0100 Subject: [PATCH] Nits --- .../steamwar/kotlin/message/ComponentMessage.kt | 15 +++++++-------- .../steamwar/tntleague/command/InviteCommand.kt | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/KotlinCore/src/de/steamwar/kotlin/message/ComponentMessage.kt b/KotlinCore/src/de/steamwar/kotlin/message/ComponentMessage.kt index e1e1023b..12ba5f0a 100644 --- a/KotlinCore/src/de/steamwar/kotlin/message/ComponentMessage.kt +++ b/KotlinCore/src/de/steamwar/kotlin/message/ComponentMessage.kt @@ -32,13 +32,12 @@ class ComponentMessage(private val resourceBundleName: String, private val class override fun name(): Key = Key.key("steamwar", resourceBundleName) - override fun translate(key: String, locale: Locale): MessageFormat? { - val rb = ResourceBundle.getBundle(resourceBundleName, locale, classLoader) - - return if (rb.containsKey(key)) { - MessageFormat(rb.getString(key), locale) - } else { - null + override fun translate(key: String, locale: Locale) = + ResourceBundle.getBundle(resourceBundleName, locale, classLoader).let { + if (it.containsKey(key)) { + MessageFormat(it.getString(key), locale) + } else { + null + } } - } } diff --git a/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt b/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt index eea883c6..b33806c7 100644 --- a/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt +++ b/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt @@ -55,4 +55,4 @@ object InviteCommand: SWCommand("invite") { fun isLeader(): TypeValidator { return TypeValidator { _, player, _ -> TNTLeagueGame.getTeam(player)?.leader == player} } -} \ No newline at end of file +}