diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java index e1fe3ae8f..53a972c74 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java @@ -95,11 +95,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP private Runnable retrySearch; public DownloadListPage(RemoteModRepository repository) { - this(repository, null); - } - - public DownloadListPage(RemoteModRepository repository, DownloadPage.DownloadCallback callback) { - this(repository, callback, false); + this(repository, null, false); } public DownloadListPage(RemoteModRepository repository, DownloadPage.DownloadCallback callback, boolean versionSelection) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java index d5191e6fb..6f92255da 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java @@ -439,7 +439,9 @@ public class DownloadPage extends Control implements DecoratorPage { private static final class ModVersion extends JFXDialogLayout { public ModVersion(RemoteMod.Version version, DownloadPage selfPage) { - this.setHeading(new HBox(new Label(i18n("mods.download.title", version.getName())))); + boolean isModpack = selfPage.repository.getType() == RemoteModRepository.Type.MODPACK; + + this.setHeading(new HBox(new Label(i18n(isModpack ? "modpack.download.title" : "mods.download.title", version.getName())))); VBox box = new VBox(8); box.setPadding(new Insets(8)); @@ -461,7 +463,7 @@ public class DownloadPage extends Control implements DecoratorPage { this.setBody(box); - JFXButton downloadButton = new JFXButton(i18n("mods.install")); + JFXButton downloadButton = new JFXButton(isModpack ? i18n("install.modpack") : i18n("mods.install")); downloadButton.getStyleClass().add("dialog-accept"); downloadButton.setOnAction(e -> { if (!spinnerPane.isLoading() && spinnerPane.getFailedReason() == null) { diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 5df7f4fad..ae17e2c94 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -848,6 +848,7 @@ modpack.completion=Downloading dependencies modpack.desc=Describe your modpack, including an introduction and probably some changelog. Markdown and images from URL are currently supported. modpack.description=Modpack Description modpack.download=Download Modpacks +modpack.download.title=Download Modpack - %1s modpack.enter_name=Enter a name for this modpack. modpack.export=Export as Modpack modpack.export.as=Export Modpack As... diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 5ad769601..0a6c14ad5 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -662,6 +662,7 @@ modpack.completion=下載模組包相關檔案 modpack.desc=描述你要製作的模組包,比如模組包注意事項和更新紀錄,支援 Markdown (圖片請上傳至網路)。 modpack.description=模組包描述 modpack.download=下載模組包 +modpack.download.title=模組包下載 - %1s modpack.enter_name=給遊戲取個你喜歡的名稱 modpack.export=匯出模組包 modpack.export.as=請選取模組包類型。若你無法決定,請選取 MCBBS 類型。 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 42c45f49c..8430086fe 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -673,6 +673,7 @@ modpack.completion=下载整合包相关文件 modpack.desc=描述你要制作的整合包,比如整合包注意事项和更新记录,支持 Markdown (图片请用网络链接) modpack.description=整合包描述 modpack.download=下载整合包 +modpack.download.title=整合包下载 - %1s modpack.enter_name=给游戏起个你喜欢的名字 modpack.export=导出整合包 modpack.export.as=请选择整合包类型 (若无法决定,请选择“我的世界中文论坛整合包标准”)