diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java index 28e935fa6..8de943a90 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java @@ -57,7 +57,7 @@ public class InstallerItem extends BorderPane { if (libraryVersion == null) { label.setText(i18n("install.installer.not_installed", i18n("install.installer." + libraryId))); } else { - label.setText(i18n("install.installer.version", i18n("install.installer." + libraryId)) + ": " + libraryVersion); + label.setText(i18n("install.installer.version", i18n("install.installer." + libraryId), libraryVersion)); } setCenter(label); regularLibrary = true; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java index 7f92631a6..2799bc285 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java @@ -20,7 +20,6 @@ package org.jackhuang.hmcl.ui.download; import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; -import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.LibraryAnalyzer; import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.game.GameRepository; @@ -40,7 +39,7 @@ class AdditionalInstallersPage extends InstallersPage { protected final String gameVersion; protected final Version version; - public AdditionalInstallersPage(String gameVersion, Version version, WizardController controller, GameRepository repository, DownloadProvider downloadProvider) { + public AdditionalInstallersPage(String gameVersion, Version version, WizardController controller, GameRepository repository, InstallerWizardDownloadProvider downloadProvider) { super(controller, repository, gameVersion, downloadProvider); this.gameVersion = gameVersion; this.version = version; @@ -108,7 +107,7 @@ class AdditionalInstallersPage extends InstallersPage { libraries[i].removable.set(true); compatible = false; } else if (alreadyInstalled || getVersion(libraryId) != null) { - libraries[i].label.set(i18n("install.installer.version", i18n("install.installer." + libraryId)) + ": " + libraryVersion); + libraries[i].label.set(i18n("install.installer.version", i18n("install.installer." + libraryId), libraryVersion)); libraries[i].removable.set(true); } else { libraries[i].label.set(i18n("install.installer.not_installed", i18n("install.installer." + libraryId))); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java index b40924973..de5653280 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java @@ -105,7 +105,7 @@ public class InstallersPage extends Control implements WizardPage { for (InstallerPageItem library : libraries) { String libraryId = library.id; if (controller.getSettings().containsKey(libraryId)) { - library.label.set(i18n("install.installer.version", i18n("install.installer." + libraryId)) + ": " + getVersion(libraryId)); + library.label.set(i18n("install.installer.version", i18n("install.installer." + libraryId), getVersion(libraryId))); library.removable.set(true); } else { library.label.setValue(i18n("install.installer.not_installed", i18n("install.installer." + libraryId))); diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 9e1484e8c..03fdc6aff 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -151,9 +151,9 @@ install.installer.install_offline.tooltip=Supports import of Forge/OptiFine inst install.installer.install_online=Install Online install.installer.install_online.tooltip=Support installation of Fabric, Forge, OptiFine, LiteLoader. install.installer.liteloader=LiteLoader -install.installer.not_installed=%s not Installed +install.installer.not_installed=%s Version: not installed install.installer.optifine=OptiFine -install.installer.version=%s Version +install.installer.version=%s Version: %s install.modpack=Install a modpack install.new_game=Install a New Game install.new_game.already_exists=This version already exists. diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index 023fe1dcf..e3a5072e5 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -149,7 +149,7 @@ install.installer.install_online.tooltip=Soporta instalación de Fabric, Forge, install.installer.liteloader=LiteLoader install.installer.not_installed=%s no está instalado install.installer.optifine=OptiFine -install.installer.version=Versión %s +install.installer.version=Versión %s: %s install.modpack=Instalar un modpack install.new_game=Instalar un juego nuevo install.new_game.already_exists=Esta versión ya existe. diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index 0d397dd24..a6c980a75 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -153,7 +153,7 @@ install.installer.install_online.tooltip=Поддерживается устан install.installer.liteloader=LiteLoader install.installer.not_installed=%s не установлен install.installer.optifine=OptiFine -install.installer.version=%s - версия +install.installer.version=%s - версия: %s install.modpack=Установить модпак install.new_game=Установите новую игру install.new_game.already_exists=Эта версия уже существует. diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 3675d488e..47dda45af 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -150,9 +150,9 @@ install.installer.install_offline.tooltip=支援匯入已經下載好的 Forge/O install.installer.install_online=線上安裝 install.installer.install_online.tooltip=支援安裝 Fabric、Forge、OptiFine、LiteLoader install.installer.liteloader=LiteLoader -install.installer.not_installed=暫時不安裝 %s,可以點選此處安裝 +install.installer.not_installed=%s 版本: 不安裝 install.installer.optifine=OptiFine -install.installer.version=%s 版本 +install.installer.version=%s 版本: %s install.modpack=安裝整合包 install.new_game=安裝新遊戲版本 install.new_game.already_exists=此版本已經存在,請重新命名 @@ -326,7 +326,7 @@ world.time=yyyy年MM月dd日 HH:mm:ss profile=遊戲目錄 profile.already_exists=該名稱已存在 profile.default=目前目錄 -profile.home=官方啟動器 +profile.home=官方啟動器目錄 profile.instance_directory=遊戲路徑 profile.instance_directory.choose=選擇遊戲路徑 profile.manage=遊戲目錄列表 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 71c06e6db..ef5cd5b15 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -150,9 +150,9 @@ install.installer.install_offline.tooltip=支持导入已经下载好的 Forge/O install.installer.install_online=在线安装 install.installer.install_online.tooltip=支持安装 Fabric、Forge、OptiFine、LiteLoader install.installer.liteloader=LiteLoader -install.installer.not_installed=暂不安装 %s,可以点击此处安装 +install.installer.not_installed=%s 版本: 不安装 install.installer.optifine=OptiFine -install.installer.version=%s 版本 +install.installer.version=%s 版本: %s install.modpack=安装整合包 install.new_game=安装新游戏版本 install.new_game.already_exists=此版本已经存在,请换一个名字 @@ -326,7 +326,7 @@ world.time=yyyy 年 MM 月 dd 日 HH:mm:ss profile=游戏目录 profile.already_exists=该名称已存在 profile.default=当前目录 -profile.home=官方启动器 +profile.home=官方启动器目录 profile.instance_directory=游戏路径 profile.instance_directory.choose=选择游戏路径 profile.manage=游戏目录列表