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..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( @@ -29,6 +30,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 = DEFAULT_LOCALE.toString(), + @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 +86,7 @@ data class GradewayConfig( ) companion object { - const val LATEST_VERSION: Int = 3 + 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 859448e..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 @@ -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,6 +34,12 @@ class CommonLanguageManager(val gradeway: CommonGradeway<*>) : LanguageManager { saveResourceLanguages() translator = MiniMessageTranslationStore.create(Key.key("gradeway", "languages"), gradeway.miniMessage) + val defaultLocale = gradeway.configs.gradewayEntry.config.defaultLocale + if (defaultLocale.isNotBlank()) { + translator.defaultLocale(Locale.of(defaultLocale)) + } else { + translator.defaultLocale(GradewayConfig.DEFAULT_LOCALE) + } val availableLocales = Locale.availableLocales().toList() directory.listDirectoryEntries("*.properties").forEach { filePath ->