From 8d3794d8286b9c7d9a621c8733e30ed7baa83bb2 Mon Sep 17 00:00:00 2001 From: 3gf8jv4dv <3gf8jv4dv@gmail.com> Date: Fri, 7 Mar 2025 21:06:34 +0800 Subject: [PATCH] fix(i18n): split `game.version` to make different scenarios appropriate (#3709) - `game.version` indicates the currently used game instance in the game crash window, not the game version. - Change the i18n key previously used in ModListPageSkin to `mods.game.version`, to be consistent with the world section. --- .../java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java | 2 +- HMCL/src/main/resources/assets/lang/I18N.properties | 3 ++- HMCL/src/main/resources/assets/lang/I18N_es.properties | 3 ++- HMCL/src/main/resources/assets/lang/I18N_ru.properties | 1 + HMCL/src/main/resources/assets/lang/I18N_zh.properties | 3 ++- HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java index 7c3e59b9c..ab3391ff4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java @@ -290,7 +290,7 @@ class ModListPageSkin extends SkinBase { StringBuilder message = new StringBuilder(localModFile.getFileName()); if (isNotBlank(localModFile.getGameVersion())) - message.append(", ").append(i18n("game.version")).append(": ").append(localModFile.getGameVersion()); + message.append(", ").append(i18n("mods.game.version")).append(": ").append(localModFile.getGameVersion()); if (isNotBlank(localModFile.getAuthors())) message.append(", ").append(i18n("archive.author")).append(": ").append(localModFile.getAuthors()); this.message = message.toString(); diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index abcf26d6f..f510b6d0e 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -654,7 +654,7 @@ game.crash.reason.unsatisfied_link_error=Failed to launch Minecraft because of m Otherwise, if you believe this is caused by HMCL, please provide feedback to us. game.crash.title=Game Crashed game.directory=Game Path -game.version=Game Version +game.version=Game Instance help=Help help.doc=Hello Minecraft! Launcher Documentation @@ -1015,6 +1015,7 @@ mods.download=Download Mod mods.download.title=Download Mod - %1s mods.download.recommend=Recommended Mod Version - Minecraft %1s mods.enable=Enable +mods.game.version=Game Version mods.manage=Mods mods.mcbbs=MCBBS mods.mcmod=MCMod diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index 405ac392d..1005a767f 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -658,7 +658,7 @@ game.crash.reason.too_many_mods_lead_to_exceeding_the_id_limit=El juego se ha co Por favor, intenta instalar JEID o eliminar algunos mods grandes. game.crash.title=Juego colgado game.directory=Ruta del juego -game.version=Versión del juego +game.version=Instancia del juego help=Ayuda help.doc=Documentación de Hello Minecraft! Launcher @@ -1019,6 +1019,7 @@ mods.download=Descargar mod mods.download.title=Descargar mod - %1s mods.download.recommend=Versión recomendada - Minecraft %1s mods.enable=Activar +mods.game.version=Versión del juego mods.manage=Mods mods.mcbbs=MCBBS mods.mcmod=MCMod diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index bfdd76cf4..e1b4b71e6 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -1018,6 +1018,7 @@ mods.download=Скачать мод mods.download.title=Скачать мод - %1s mods.download.recommend=Рекомендуемая версия мода - Minecraft %1s mods.enable=Включить +mods.game.version=Версия игры mods.manage=Моды mods.mcbbs=MCBBS mods.mcmod=MCMod diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 7d6d3766a..45790814b 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -470,7 +470,7 @@ game.crash.reason.unknown=原因未知，請點擊日誌按鈕查看詳細訊息 game.crash.reason.unsatisfied_link_error=目前遊戲由於缺少本機庫，無法繼續執行。\n這些本機庫缺失：%1$s。\n如果你在「(全域/實例特定) 遊戲設定 → 進階設定」中修改了本機庫路徑選項，請你修改回預設模式。\n如果你正在使用預設模式，請檢查遊戲目錄路徑是否只包含英文字母、數字和底線，\n如果是，那麼請檢查是否為模組或 HMCL 導致了本機庫缺失的問題。如果你確定是 HMCL 引起的，建議你向我們回報。\n對於 Windows 使用者，你還可以嘗試在「控制台 → 時鐘和區域 → 地區 → 系統管理 → 變更系統區域設定」中，關閉「Beta：使用 Unicode UTF-8 提供全球語言支援」選項；\n或將遊戲目錄路徑中的所有非英文字母的名稱 (例如中文、空格等) 修改為英文字母。\n如果你確實需要自訂本機庫路徑，你需要保證其中包含缺失的本機庫！ game.crash.title=遊戲意外退出 game.directory=遊戲目錄路徑 -game.version=遊戲版本 +game.version=遊戲實例 help=說明 help.doc=Hello Minecraft! Launcher 說明文件 @@ -821,6 +821,7 @@ mods.download=模組下載 mods.download.title=模組下載 - %1s mods.download.recommend=推薦版本 - Minecraft %1s mods.enable=啟用 +mods.game.version=遊戲版本 mods.manage=模組管理 mods.mcbbs=MCBBS mods.mcmod=MC 百科 diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index 3ad315c6c..e3b1dc708 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -832,6 +832,7 @@ mods.download=模组下载 mods.download.title=模组下载 - %1s mods.download.recommend=推荐版本 - Minecraft %1s mods.enable=启用 +mods.game.version=游戏版本 mods.manage=模组管理 mods.mcbbs=MCBBS mods.mcmod=MC 百科