From 52a2254aff1d06331ada559715697bdd8e383287 Mon Sep 17 00:00:00 2001 From: Aaron Date: Wed, 11 Nov 2026 07:30:36 +0100 Subject: [PATCH 1/3] feat: add configurable default locale for translations --- .../dev/gradienttim/gradeway/configs/GradewayConfig.kt | 8 +++++++- .../gradeway/managers/CommonLanguageManager.kt | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt b/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt index eec487c..c334952 100644 --- a/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt +++ b/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt @@ -29,6 +29,12 @@ data class GradewayConfig( ) val secondaryColor: String = "#e89e1e", + @TomlComments( + "Defines the default locale used throughout Gradeway messages.", + "Must be a valid locale string." + ) + val defaultLocale: String = "en", + @TomlComments( "Defines the maximum decompressed size, in bytes, allowed when importing a backup or migration file.", "Protects against decompression-bomb archives that expand to consume excessive memory once decompressed.", @@ -79,6 +85,6 @@ data class GradewayConfig( ) companion object { - const val LATEST_VERSION: Int = 3 + const val LATEST_VERSION: Int = 4 } } diff --git a/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt b/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt index 859448e..fb72a0f 100644 --- a/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt +++ b/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt @@ -33,6 +33,7 @@ class CommonLanguageManager(val gradeway: CommonGradeway<*>) : LanguageManager { saveResourceLanguages() translator = MiniMessageTranslationStore.create(Key.key("gradeway", "languages"), gradeway.miniMessage) + translator.defaultLocale(Locale.of(gradeway.configs.gradewayEntry.config.defaultLocale)) val availableLocales = Locale.availableLocales().toList() directory.listDirectoryEntries("*.properties").forEach { filePath -> From b953e6eef7f317502c630bf3838cd854b730c358 Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 12 Nov 2026 13:02:20 +0100 Subject: [PATCH 2/3] fix: fallback to default locale when config locale is blank --- .../dev/gradienttim/gradeway/configs/GradewayConfig.kt | 4 +++- .../gradeway/managers/CommonLanguageManager.kt | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt b/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt index c334952..24688ea 100644 --- a/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt +++ b/core-api/src/main/kotlin/dev/gradienttim/gradeway/configs/GradewayConfig.kt @@ -6,6 +6,7 @@ package dev.gradienttim.gradeway.configs import com.akuleshov7.ktoml.annotations.TomlComments import kotlinx.serialization.Serializable +import java.util.Locale @Serializable data class GradewayConfig( @@ -33,7 +34,7 @@ data class GradewayConfig( "Defines the default locale used throughout Gradeway messages.", "Must be a valid locale string." ) - val defaultLocale: String = "en", + val defaultLocale: String = DEFAULT_LOCALE.toString(), @TomlComments( "Defines the maximum decompressed size, in bytes, allowed when importing a backup or migration file.", @@ -86,5 +87,6 @@ data class GradewayConfig( companion object { const val LATEST_VERSION: Int = 4 + val DEFAULT_LOCALE: Locale = Locale.ENGLISH } } diff --git a/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt b/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt index fb72a0f..b7e42ec 100644 --- a/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt +++ b/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt @@ -7,6 +7,7 @@ package dev.gradienttim.gradeway.managers import arrow.core.Either import arrow.core.raise.either import dev.gradienttim.gradeway.CommonGradeway +import dev.gradienttim.gradeway.configs.GradewayConfig import dev.gradienttim.gradeway.extensions.cleanUnusedKeys import dev.gradienttim.gradeway.extensions.createDirectoryIfNotExists import dev.gradienttim.gradeway.extensions.fillMissingKeys @@ -33,7 +34,12 @@ class CommonLanguageManager(val gradeway: CommonGradeway<*>) : LanguageManager { saveResourceLanguages() translator = MiniMessageTranslationStore.create(Key.key("gradeway", "languages"), gradeway.miniMessage) - translator.defaultLocale(Locale.of(gradeway.configs.gradewayEntry.config.defaultLocale)) + var defaultLocale = gradeway.configs.gradewayEntry.config.defaultLocale + if (!defaultLocale.isBlank()) { + translator.defaultLocale(Locale.of(defaultLocale)) + } else { + translator.defaultLocale(GradewayConfig.DEFAULT_LOCALE) + } val availableLocales = Locale.availableLocales().toList() directory.listDirectoryEntries("*.properties").forEach { filePath -> From fbff47482dabccd4f44ba3632523e73ae2952938 Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 12 Nov 2026 13:03:41 +0100 Subject: [PATCH 3/3] refactor: simplify default locale blank check --- .../gradienttim/gradeway/managers/CommonLanguageManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt b/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt index b7e42ec..270835a 100644 --- a/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt +++ b/core-common/src/main/kotlin/dev/gradienttim/gradeway/managers/CommonLanguageManager.kt @@ -34,8 +34,8 @@ class CommonLanguageManager(val gradeway: CommonGradeway<*>) : LanguageManager { saveResourceLanguages() translator = MiniMessageTranslationStore.create(Key.key("gradeway", "languages"), gradeway.miniMessage) - var defaultLocale = gradeway.configs.gradewayEntry.config.defaultLocale - if (!defaultLocale.isBlank()) { + val defaultLocale = gradeway.configs.gradewayEntry.config.defaultLocale + if (defaultLocale.isNotBlank()) { translator.defaultLocale(Locale.of(defaultLocale)) } else { translator.defaultLocale(GradewayConfig.DEFAULT_LOCALE)