From 1ce7eb6d3e19d3eeea436fe236f93c2827268447 Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Sat, 8 Aug 2026 23:43:45 +0800 Subject: [PATCH] Fix various incorrectly named locale keys --- .../multiverse/core/commands/CloneCommand.java | 2 +- .../multiverse/core/locale/MVCorei18n.java | 2 +- src/main/resources/multiverse-core_en.properties | 8 ++++---- src/main/resources/multiverse-core_es.properties | 4 ++-- src/main/resources/multiverse-core_pl.properties | 8 ++++---- src/main/resources/multiverse-core_ru.properties | 4 ++-- src/main/resources/multiverse-core_tr.properties | 8 ++++---- src/main/resources/multiverse-core_zh.properties | 4 ++-- .../multiverse/core/command/LocalizationTest.kt | 13 +++++++++++++ 9 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java index 5a9ada784..9b2b0b105 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java @@ -51,7 +51,7 @@ void onCloneCommand( MultiverseWorld world, @Syntax("") - @Description("{@@mv-core.clone.newWorld.description}") + @Description("{@@mv-core.clone.newworld.description}") String newWorldName, @Optional diff --git a/src/main/java/org/mvplugins/multiverse/core/locale/MVCorei18n.java b/src/main/java/org/mvplugins/multiverse/core/locale/MVCorei18n.java index dc705347f..4ec67906d 100644 --- a/src/main/java/org/mvplugins/multiverse/core/locale/MVCorei18n.java +++ b/src/main/java/org/mvplugins/multiverse/core/locale/MVCorei18n.java @@ -182,7 +182,7 @@ public enum MVCorei18n implements MessageKeyProvider { // /mv meta info META_INFO_DESCRIPTION, - META_INFO_WORLD, + META_INFO_WORLD_DESCRIPTION, META_INFO_HEADER, META_INFO_NOCONTENT, diff --git a/src/main/resources/multiverse-core_en.properties b/src/main/resources/multiverse-core_en.properties index 2dfa295a9..b44852b70 100644 --- a/src/main/resources/multiverse-core_en.properties +++ b/src/main/resources/multiverse-core_en.properties @@ -32,7 +32,7 @@ mv-core.check.location=The destination's location is: &f{location} # /mv clone mv-core.clone.description=Clones a world. mv-core.clone.world.description=The target world to clone. -mv-core.clone.newWorld.description=The new cloned world name. +mv-core.clone.newworld.description=The new cloned world name. mv-core.clone.cloning=Cloning world '{world}' to '{newworld}'... mv-core.clone.success=&aWorld cloned to '{world}'! @@ -53,7 +53,7 @@ mv-core.coordinates.description=Simply sends your coordinates mv-core.coordinates.info.title=&b--- Location Information --- mv-core.coordinates.info.world=&bWorld: &f{world} mv-core.coordinates.info.alias=&bAlias: &f{alias} -mv-core.coordinates.info.worldScale=&bWorld Scale: &f{scale} +mv-core.coordinates.info.worldscale=&bWorld Scale: &f{scale} mv-core.coordinates.info.coordinates=&bCoordinates: &f{coordinates} mv-core.coordinates.info.direction=&bDirection: &f{direction} @@ -384,14 +384,14 @@ mv-core.importworld.worldexistunloaded=World '{world}' already exists, but it's mv-core.importworld.worldexistloaded=World '{world}' already exists! mv-core.importworld.worldfolderinvalid=World '{world}' folder contents does not seem to be a valid world! Make sure it contains the correct world structure of data and region folders.\n&cIf the server software does something different with world folders, or you are very certain the world is valid, use '&3--skip-folder-check&c' flag. mv-core.importworld.bukkitenvironmentmismatch=Environment mismatch detected!&f The world '{world}' is already loaded with environment '{bukkitEnvironment}', but Multiverse is trying to import it with environment '{mvEnvironment}'. -mv-core.importworld.bukkitnamespacemismatch=Namespace mismatch detected!&f The world '{world}' is already loaded with namespace '{bukkitNamespace}', but Multiverse is trying to import it with namespace '{mvNamespace}'. +mv-core.importworld.bukkitnamespacedkeymismatch=Namespace mismatch detected!&f The world '{world}' is already loaded with namespace '{bukkitNamespace}', but Multiverse is trying to import it with namespace '{mvNamespace}'. mv-core.loadworld.worldalreadyloading=World '{world}' is already loading! Please wait... mv-core.loadworld.worldnonexistent=World '{world}' not found! Use '&a/mv create {world} &f' to create it. mv-core.loadworld.worldexistfolder=World '{world}' exists in server folders, but it's not known to Multiverse!&f Type '&a/mv import {world} &f' if you wish to import it. mv-core.loadworld.worldexistloaded=World '{world}' is already loaded! mv-core.loadworld.bukkitenvironmentmismatch=Environment mismatch detected!&f The world '{world}' is already loaded with environment '{bukkitEnvironment}', but Multiverse is trying to load it with environment '{mvEnvironment}'. -mv-core.loadworld.bukkitnamespacemismatch=Namespace mismatch detected!&f The world '{world}' is already loaded with namespace '{bukkitNamespace}', but Multiverse is trying to load it with namespace '{mvNamespace}'. +mv-core.loadworld.bukkitnamespacedkeymismatch=Namespace mismatch detected!&f The world '{world}' is already loaded with namespace '{bukkitNamespace}', but Multiverse is trying to load it with namespace '{mvNamespace}'. mv-core.removeworld.worldnonexistent=World '{world}' not found! diff --git a/src/main/resources/multiverse-core_es.properties b/src/main/resources/multiverse-core_es.properties index e2ac09201..c34cf4aed 100644 --- a/src/main/resources/multiverse-core_es.properties +++ b/src/main/resources/multiverse-core_es.properties @@ -32,7 +32,7 @@ mv-core.check.location=La localización de su destino es: &f{location} # /mv clone mv-core.clone.description=Clona un mundo. mv-core.clone.world.description=El mundo a clonar. -mv-core.clone.newWorld.description=El nombre del nuevo mundo clonado. +mv-core.clone.newworld.description=El nombre del nuevo mundo clonado. mv-core.clone.cloning=Clonando mundo '{world}' a '{newworld}'... mv-core.clone.success=&a¡Mundo clonado a '{world}'! @@ -53,7 +53,7 @@ mv-core.coordinates.description=Simple y llanamente te muestra tus coordenadas. mv-core.coordinates.info.title=&b--- Información de la localización --- mv-core.coordinates.info.world=&bMundo: &f{world} mv-core.coordinates.info.alias=&bAlias: &f{alias} -mv-core.coordinates.info.worldScale=&bEscala del mundo: &f{scale} +mv-core.coordinates.info.worldscale=&bEscala del mundo: &f{scale} mv-core.coordinates.info.coordinates=&bCoordenadas: &f{coordinates} mv-core.coordinates.info.direction=&bDirección: &f{direction} diff --git a/src/main/resources/multiverse-core_pl.properties b/src/main/resources/multiverse-core_pl.properties index 352ff1dd5..e9b8c7d67 100644 --- a/src/main/resources/multiverse-core_pl.properties +++ b/src/main/resources/multiverse-core_pl.properties @@ -32,7 +32,7 @@ mv-core.check.location=&fLokalizacja celu: &a{location} # /mv clone mv-core.clone.description=Klonuje świat. mv-core.clone.world.description=Świat do sklonowania. -mv-core.clone.newWorld.description=Nazwa nowego sklonowanego świata. +mv-core.clone.newworld.description=Nazwa nowego sklonowanego świata. mv-core.clone.cloning=&e&l! &fTrwa klonowanie świata '&a{world}&f' do '&a{newworld}&f'... mv-core.clone.success=&a&l✔ &fŚwiat został sklonowany jako '&a{world}&f'! @@ -56,7 +56,7 @@ mv-core.coordinates.description=Wysyła twoje koordynaty. mv-core.coordinates.info.title=&a&l--- Informacje o Lokalizacji --- mv-core.coordinates.info.world=&fŚwiat: &a{world} mv-core.coordinates.info.alias=&fAlias: &a{alias} -mv-core.coordinates.info.worldScale=&fSkala świata: &a{scale} +mv-core.coordinates.info.worldscale=&fSkala świata: &a{scale} mv-core.coordinates.info.coordinates=&fKoordynaty: &a{coordinates} mv-core.coordinates.info.direction=&fKierunek: &a{direction} @@ -393,14 +393,14 @@ mv-core.importworld.worldexistunloaded=&e&l! &eŚwiat '&a{world}&e' już istniej mv-core.importworld.worldexistloaded=&c&l✘ &cŚwiat '&a{world}&c' już istnieje! mv-core.importworld.worldfolderinvalid=&c&l✘ &cFolder świata '&a{world}&c' nie wygląda na poprawny świat! Upewnij się, że zawiera poprawną strukturę folderów data oraz region.\n&eJeśli oprogramowanie serwera działa inaczej lub masz pewność, że świat jest poprawny, użyj flagi '&a--skip-folder-check&e'. mv-core.importworld.bukkitenvironmentmismatch=&c&l✘ &cWykryto niezgodność environment! &fŚwiat '&a{world}&f' jest już załadowany z environment '&a{bukkitEnvironment}&f', ale Multiverse próbuje zaimportować go jako '&a{mvEnvironment}&f'. -mv-core.importworld.bukkitnamespacemismatch=&c&l✘ &cWykryto niezgodność namespace! &fŚwiat '&a{world}&f' jest już załadowany z namespace '&a{bukkitNamespace}&f', ale Multiverse próbuje zaimportować go jako '&a{mvNamespace}&f'. +mv-core.importworld.bukkitnamespacedkeymismatch=&c&l✘ &cWykryto niezgodność namespace! &fŚwiat '&a{world}&f' jest już załadowany z namespace '&a{bukkitNamespace}&f', ale Multiverse próbuje zaimportować go jako '&a{mvNamespace}&f'. mv-core.loadworld.worldalreadyloading=&e&l! &eŚwiat '&a{world}&e' jest już ładowany! Poczekaj... mv-core.loadworld.worldnonexistent=&c&l✘ &cŚwiat '&a{world}&c' nie istnieje! Użyj '&a/mv create {world} &f', aby go stworzyć. mv-core.loadworld.worldexistfolder=&e&l! &eŚwiat '&a{world}&e' istnieje w folderach serwera, ale nie jest znany Multiverse! &fWpisz '&a/mv import {world} &f', jeśli chcesz go zaimportować. mv-core.loadworld.worldexistloaded=&e&l! &eŚwiat '&a{world}&e' jest już załadowany! mv-core.loadworld.bukkitenvironmentmismatch=&c&l✘ &cWykryto niezgodność environment! &fŚwiat '&a{world}&f' jest już załadowany z environment '&a{bukkitEnvironment}&f', ale Multiverse próbuje załadować go jako '&a{mvEnvironment}&f'. -mv-core.loadworld.bukkitnamespacemismatch=&c&l✘ &cWykryto niezgodność namespace! &fŚwiat '&a{world}&f' jest już załadowany z namespace '&a{bukkitNamespace}&f', ale Multiverse próbuje załadować go jako '&a{mvNamespace}&f'. +mv-core.loadworld.bukkitnamespacedkeymismatch=&c&l✘ &cWykryto niezgodność namespace! &fŚwiat '&a{world}&f' jest już załadowany z namespace '&a{bukkitNamespace}&f', ale Multiverse próbuje załadować go jako '&a{mvNamespace}&f'. mv-core.removeworld.worldnonexistent=&c&l✘ &cNie znaleziono świata '&a{world}&c'! diff --git a/src/main/resources/multiverse-core_ru.properties b/src/main/resources/multiverse-core_ru.properties index 61e239270..c08d7c30e 100644 --- a/src/main/resources/multiverse-core_ru.properties +++ b/src/main/resources/multiverse-core_ru.properties @@ -32,7 +32,7 @@ mv-core.check.location=Местоположение пункта назначе # /mv clone mv-core.clone.description=Клонирует мир. mv-core.clone.world.description=Целевой мир для клонирования. -mv-core.clone.newWorld.description=Название нового клонированного мира. +mv-core.clone.newworld.description=Название нового клонированного мира. mv-core.clone.cloning=Клонирование мира '{world}' в '{newworld}'... mv-core.clone.success=&aМир клонирован в '{world}'! @@ -53,7 +53,7 @@ mv-core.coordinates.description=Просто отправляет ваши ко mv-core.coordinates.info.title=&b--- Информация о местоположении --- mv-core.coordinates.info.world=&bМир: &f{world} mv-core.coordinates.info.alias=&bПсевдоним: &f{alias} -mv-core.coordinates.info.worldScale=&bМасштаб мира: &f{scale} +mv-core.coordinates.info.worldscale=&bМасштаб мира: &f{scale} mv-core.coordinates.info.coordinates=&bКоординаты: &f{coordinates} mv-core.coordinates.info.direction=&bНаправление: &f{direction} diff --git a/src/main/resources/multiverse-core_tr.properties b/src/main/resources/multiverse-core_tr.properties index 868a55a1f..ba49620fb 100644 --- a/src/main/resources/multiverse-core_tr.properties +++ b/src/main/resources/multiverse-core_tr.properties @@ -32,7 +32,7 @@ mv-core.check.location=Hedefin konumu: &f{location} # /mv clone mv-core.clone.description=Bir dünyayı kopyalar. mv-core.clone.world.description=Kopyalanacak hedef dünya. -mv-core.clone.newWorld.description=Yeni kopyalanan dünyanın adı. +mv-core.clone.newworld.description=Yeni kopyalanan dünyanın adı. mv-core.clone.cloning='{world}' dünyası '{newworld}' olarak kopyalanıyor... mv-core.clone.success=&aDünya '{world}' olarak kopyalandı! @@ -53,7 +53,7 @@ mv-core.coordinates.description=Koordinatlarınızı gösterir mv-core.coordinates.info.title=&b--- Konum Bilgisi --- mv-core.coordinates.info.world=&bDünya: &f{world} mv-core.coordinates.info.alias=&bTakma Ad: &f{alias} -mv-core.coordinates.info.worldScale=&bDünya Ölçeği: &f{scale} +mv-core.coordinates.info.worldscale=&bDünya Ölçeği: &f{scale} mv-core.coordinates.info.coordinates=&bKoordinatlar: &f{coordinates} mv-core.coordinates.info.direction=&bYön: &f{direction} @@ -384,14 +384,14 @@ mv-core.importworld.worldexistunloaded='{world}' dünyası zaten mevcut, ancak y mv-core.importworld.worldexistloaded='{world}' dünyası zaten mevcut! mv-core.importworld.worldfolderinvalid='{world}' dünya klasörünün içeriği geçerli bir dünya gibi görünmüyor! Doğru veri ve bölge klasörleri içerdiğinden emin olun.\n&cSunucu yazılımı dünya klasörleriyle farklı bir şey yapıyorsa veya dünyanın geçerli olduğundan çok eminseniz, '&3--skip-folder-check&c' bayrağını kullanın. mv-core.importworld.bukkitenvironmentmismatch=Ortam uyuşmazlığı tespit edildi!&f '{world}' dünyası '{bukkitEnvironment}' ortamıyla zaten yüklü, ancak Multiverse onu '{mvEnvironment}' ortamıyla içe aktarmaya çalışıyor. -mv-core.importworld.bukkitnamespacemismatch=Ad alanı uyuşmazlığı tespit edildi!&f '{world}' dünyası '{bukkitNamespace}' ad alanıyla zaten yüklü, ancak Multiverse onu '{mvNamespace}' ad alanıyla içe aktarmaya çalışıyor. +mv-core.importworld.bukkitnamespacedkeymismatch=Ad alanı uyuşmazlığı tespit edildi!&f '{world}' dünyası '{bukkitNamespace}' ad alanıyla zaten yüklü, ancak Multiverse onu '{mvNamespace}' ad alanıyla içe aktarmaya çalışıyor. mv-core.loadworld.worldalreadyloading='{world}' dünyası zaten yükleniyor! Lütfen bekleyin... mv-core.loadworld.worldnonexistent='{world}' dünyası bulunamadı! Oluşturmak için '&a/mv create {world} &f' kullanın. mv-core.loadworld.worldexistfolder='{world}' dünyası sunucu klasörlerinde mevcut, ancak Multiverse tarafından bilinmiyor!&f İçe aktarmak istiyorsanız '&a/mv import {world} &f' yazın. mv-core.loadworld.worldexistloaded='{world}' dünyası zaten yüklü! mv-core.loadworld.bukkitenvironmentmismatch=Ortam uyuşmazlığı tespit edildi!&f '{world}' dünyası '{bukkitEnvironment}' ortamıyla zaten yüklü, ancak Multiverse onu '{mvEnvironment}' ortamıyla yüklemeye çalışıyor. -mv-core.loadworld.bukkitnamespacemismatch=Ad alanı uyuşmazlığı tespit edildi!&f '{world}' dünyası '{bukkitNamespace}' ad alanıyla zaten yüklü, ancak Multiverse onu '{mvNamespace}' ad alanıyla yüklemeye çalışıyor. +mv-core.loadworld.bukkitnamespacedkeymismatch=Ad alanı uyuşmazlığı tespit edildi!&f '{world}' dünyası '{bukkitNamespace}' ad alanıyla zaten yüklü, ancak Multiverse onu '{mvNamespace}' ad alanıyla yüklemeye çalışıyor. mv-core.removeworld.worldnonexistent='{world}' dünyası bulunamadı! diff --git a/src/main/resources/multiverse-core_zh.properties b/src/main/resources/multiverse-core_zh.properties index ad973188b..1ba08a5c7 100644 --- a/src/main/resources/multiverse-core_zh.properties +++ b/src/main/resources/multiverse-core_zh.properties @@ -32,7 +32,7 @@ mv-core.check.location=目标的地址是： &f{location} # /mv clone mv-core.clone.description=复制一个世界。 mv-core.clone.world.description=需要复制的原世界。 -mv-core.clone.newWorld.description=新世界的名称。 +mv-core.clone.newworld.description=新世界的名称。 mv-core.clone.cloning=正在复制 '{world}' 到 '{newworld}'…… mv-core.clone.success=&a已将世界复制到 '{world}'！ @@ -53,7 +53,7 @@ mv-core.coordinates.description=直接发送你的坐标 mv-core.coordinates.info.title=&b--- 位置信息 --- mv-core.coordinates.info.world=&b世界： &f{world} mv-core.coordinates.info.alias=&b别名： &f{alias} -mv-core.coordinates.info.worldScale=&b世界比例： &f{scale} +mv-core.coordinates.info.worldscale=&b世界比例： &f{scale} mv-core.coordinates.info.coordinates=&b坐标： &f{coordinates} mv-core.coordinates.info.direction=&b方向： &f{direction} diff --git a/src/test/java/org/mvplugins/multiverse/core/command/LocalizationTest.kt b/src/test/java/org/mvplugins/multiverse/core/command/LocalizationTest.kt index 0b4f9828d..6c076e980 100644 --- a/src/test/java/org/mvplugins/multiverse/core/command/LocalizationTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/command/LocalizationTest.kt @@ -18,6 +18,7 @@ import org.mvplugins.multiverse.core.locale.PluginLocales import org.mvplugins.multiverse.core.locale.message.Message import org.mvplugins.multiverse.core.locale.message.MessageReplacement.replace import java.util.Locale +import java.util.Properties import kotlin.test.* class LocalizationTest : TestWithMockBukkit() { @@ -31,6 +32,18 @@ class LocalizationTest : TestWithMockBukkit() { locales = commandManager.locales } + @Test + fun `Default locale bundle contains every message key`() { + val properties = Properties() + assertNotNull(javaClass.getResourceAsStream("/multiverse-core_en.properties")).use { + properties.load(it) + } + + MVCorei18n.entries.forEach { message -> + assertTrue(properties.containsKey(message.messageKey.key), "Missing locale key: ${message.messageKey.key}") + } + } + @Nested @DisplayName("Given a Message with only a non-localized message") inner class BasicMessage {