Skip to content

Fix various incorrectly named locale keys #3511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 1 commit into from
Aug 8, 2026
+33 −20
Merged

Fix various incorrectly named locale keys #3511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void onCloneCommand(
MultiverseWorld world,

@Syntax("<new-world-name>")
@Description("{@@mv-core.clone.newWorld.description}")
@Description("{@@mv-core.clone.newworld.description}")
String newWorldName,

@Optional
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mvplugins/multiverse/core/locale/MVCorei18n.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/multiverse-core_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# /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.

Check warning on line 35 in src/main/resources/multiverse-core_en.properties

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'.

Raw Output:
/github/workspace/src/main/resources/multiverse-core_en.properties:35:0: warning: Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'. (com.puppycrawl.tools.checkstyle.checks.OrderedPropertiesCheck)
mv-core.clone.cloning=Cloning world '{world}' to '{newworld}'...
mv-core.clone.success=&aWorld cloned to '{world}'!

Expand All @@ -53,7 +53,7 @@
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}

Expand Down Expand Up @@ -384,14 +384,14 @@
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} <environment>&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} <environment>&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!

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/multiverse-core_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# /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.

Check warning on line 35 in src/main/resources/multiverse-core_es.properties

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'.

Raw Output:
/github/workspace/src/main/resources/multiverse-core_es.properties:35:0: warning: Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'. (com.puppycrawl.tools.checkstyle.checks.OrderedPropertiesCheck)
mv-core.clone.cloning=Clonando mundo '{world}' a '{newworld}'...
mv-core.clone.success=&a¡Mundo clonado a '{world}'!

Expand All @@ -53,7 +53,7 @@
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}

Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/multiverse-core_pl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# /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.

Check warning on line 35 in src/main/resources/multiverse-core_pl.properties

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'.

Raw Output:
/github/workspace/src/main/resources/multiverse-core_pl.properties:35:0: warning: Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'. (com.puppycrawl.tools.checkstyle.checks.OrderedPropertiesCheck)
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'!

Expand All @@ -56,7 +56,7 @@
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}

Expand Down Expand Up @@ -393,14 +393,14 @@
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} <environment>&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} <environment>&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'!

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/multiverse-core_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# /mv clone
mv-core.clone.description=Клонирует мир.
mv-core.clone.world.description=Целевой мир для клонирования.
mv-core.clone.newWorld.description=Название нового клонированного мира.
mv-core.clone.newworld.description=Название нового клонированного мира.

Check warning on line 35 in src/main/resources/multiverse-core_ru.properties

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'.

Raw Output:
/github/workspace/src/main/resources/multiverse-core_ru.properties:35:0: warning: Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'. (com.puppycrawl.tools.checkstyle.checks.OrderedPropertiesCheck)
mv-core.clone.cloning=Клонирование мира '{world}' в '{newworld}'...
mv-core.clone.success=&aМир клонирован в '{world}'!

Expand All @@ -53,7 +53,7 @@
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}

Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/multiverse-core_tr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# /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ı.

Check warning on line 35 in src/main/resources/multiverse-core_tr.properties

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'.

Raw Output:
/github/workspace/src/main/resources/multiverse-core_tr.properties:35:0: warning: Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'. (com.puppycrawl.tools.checkstyle.checks.OrderedPropertiesCheck)
mv-core.clone.cloning='{world}' dünyası '{newworld}' olarak kopyalanıyor...
mv-core.clone.success=&aDünya '{world}' olarak kopyalandı!

Expand All @@ -53,7 +53,7 @@
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}

Expand Down Expand Up @@ -384,14 +384,14 @@
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} <ortam>&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} <ortam>&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ı!

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/multiverse-core_zh.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# /mv clone
mv-core.clone.description=复制一个世界。
mv-core.clone.world.description=需要复制的原世界。
mv-core.clone.newWorld.description=新世界的名称。
mv-core.clone.newworld.description=新世界的名称。

Check warning on line 35 in src/main/resources/multiverse-core_zh.properties

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'.

Raw Output:
/github/workspace/src/main/resources/multiverse-core_zh.properties:35:0: warning: Property key 'mv-core.clone.newworld.description' is not in the right order with previous property 'mv-core.clone.world.description'. (com.puppycrawl.tools.checkstyle.checks.OrderedPropertiesCheck)
mv-core.clone.cloning=正在复制 '{world}' 到 '{newworld}'……
mv-core.clone.success=&a已将世界复制到 '{world}'！

Expand All @@ -53,7 +53,7 @@
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}

Expand Down
13 changes: 13 additions & 0 deletions src/test/java/org/mvplugins/multiverse/core/command/LocalizationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 {
Expand Down
Loading