From 997a16486bb8efcfce90831f335efdeacd86129e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=9E=E5=BA=90?= <109708109+Ciilu@users.noreply.github.com> Date: Fri, 4 Apr 2025 00:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=A0=87=E9=A2=98=20(#3771)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update * Update HMCL/src/main/resources/assets/lang/I18N.properties Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> * Update HMCL/src/main/resources/assets/lang/I18N.properties Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> * Update HMCL/src/main/resources/assets/lang/I18N_es.properties Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> * Update HMCL/src/main/resources/assets/lang/I18N_es.properties Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> * Apply suggestions from code review Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> * update * update * update --------- Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> Co-authored-by: Glavo --- .../hmcl/ui/versions/DownloadPage.java | 24 +++++++++++++++---- .../resources/assets/lang/I18N.properties | 2 ++ .../resources/assets/lang/I18N_es.properties | 2 ++ .../resources/assets/lang/I18N_ru.properties | 2 ++ .../resources/assets/lang/I18N_zh.properties | 2 ++ .../assets/lang/I18N_zh_CN.properties | 2 ++ 6 files changed, 30 insertions(+), 4 deletions(-) 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 18df521a8..c6ad06f8b 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,9 +439,25 @@ public class DownloadPage extends Control implements DecoratorPage { private static final class ModVersion extends JFXDialogLayout { public ModVersion(RemoteMod.Version version, DownloadPage selfPage) { - boolean isModpack = selfPage.repository.getType() == RemoteModRepository.Type.MODPACK; + RemoteModRepository.Type type = selfPage.repository.getType(); - this.setHeading(new HBox(new Label(i18n(isModpack ? "modpack.download.title" : "mods.download.title", version.getName())))); + String title; + switch (type) { + case WORLD: + title = "world.download.title"; + break; + case MODPACK: + title = "modpack.download.title"; + break; + case RESOURCE_PACK: + title = "resourcepack.download.title"; + break; + case MOD: + default: + title = "mods.download.title"; + break; + } + this.setHeading(new HBox(new Label(i18n(title, version.getName())))); VBox box = new VBox(8); box.setPadding(new Insets(8)); @@ -463,10 +479,10 @@ public class DownloadPage extends Control implements DecoratorPage { this.setBody(box); - JFXButton downloadButton = new JFXButton(isModpack ? i18n("install.modpack") : i18n("mods.install")); + JFXButton downloadButton = new JFXButton(type == RemoteModRepository.Type.MODPACK ? i18n("install.modpack") : i18n("mods.install")); downloadButton.getStyleClass().add("dialog-accept"); downloadButton.setOnAction(e -> { - if (isModpack || !spinnerPane.isLoading() && spinnerPane.getFailedReason() == null) { + if (type == RemoteModRepository.Type.MODPACK || !spinnerPane.isLoading() && spinnerPane.getFailedReason() == null) { fireEvent(new DialogCloseEvent()); } selfPage.download(version); diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 4ab68ce93..1c1d453a0 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -1058,6 +1058,7 @@ world.datapack=Manage Datapacks world.datapack.1_13=Only Minecraft 1.13 or later supports datapacks. world.datetime=Last played on %s world.download=Download World +world.download.title=Download World - %1s world.export=Export the World world.export.title=Choose the directory for this exported world world.export.location=Save As @@ -1129,6 +1130,7 @@ repositories.chooser=HMCL requires JavaFX to work.\n\ repositories.chooser.title=Choose download source for JavaFX resourcepack=Resource Packs +resourcepack.download.title=Download Resource Pack - %1s search=Search search.hint.chinese=Search in English and Chinese diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index 4c650819f..8db271810 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -1062,6 +1062,7 @@ world.datapack=Gestionar paquetes de datos world.datapack.1_13=Sólo Minecraft 1.13 o posterior soporta paquetes de datos. world.datetime=Jugado por última vez en %s world.download=Descargar Mundo +world.download.title=Descargar mundo - %1s world.export=Exportar el mundo world.export.title=Elija el directorio para este mundo exportado world.export.location=Guardar como @@ -1133,6 +1134,7 @@ repositories.chooser=HMCL requiere JavaFX para funcionar.\n\ repositories.chooser.title=Elija la fuente de descarga de JavaFX resourcepack=Paquetes de recursos +resourcepack.download.title=Descargar paquete de recursos - %1s search=Búsqueda search.hint.chinese=Buscar en inglés y chino diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index 76023ec76..f813ea935 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -1061,6 +1061,7 @@ world.datapack=Управлять наборами данных world.datapack.1_13=Только Minecraft 1.13 или новее поддерживает наборы данных. world.datetime=Последний запуск игры %s world.download=Скачать мир +world.download.title=Скачать мир - %1s world.export=Экспорт мира world.export.title=Выберите папку для экспорта мира world.export.location=Экспорт в @@ -1132,6 +1133,7 @@ repositories.chooser=Для работы HMCL требуется JavaFX.\n\ repositories.chooser.title=Выберите зеркало для скачивания JavaFX resourcepack=Пакеты ресурсов +resourcepack.download.title=Скачать пакет ресурсов - %1s search=Поиск search.hint.chinese=Поиск на китайском и английском языках diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 13d700438..ba2fe55fb 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -863,6 +863,7 @@ world.datapack=管理資料包 world.datapack.1_13=僅 Minecraft 1.13 及之後的版本支援資料包 world.datetime=上一次遊戲時間: %s world.download=下載世界 +world.download.title=世界下載 - %1s world.export=匯出此世界 world.export.title=選取該世界的儲存位置 world.export.location=儲存到 @@ -930,6 +931,7 @@ repositories.chooser=缺少 JavaFX 執行環境，HMCL 需要 JavaFX 才能正 repositories.chooser.title=選取 JavaFX 下載源 resourcepack=資源包 +resourcepack.download.title=資源包下載 - %1s search=搜尋 search.hint.chinese=支援中英文搜尋 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 11a64e206..6b5950291 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -874,6 +874,7 @@ world.datapack=管理数据包 world.datapack.1_13=仅 Minecraft 1.13 及之后的版本支持数据包 world.datetime=上一次游戏时间: %s world.download=下载世界 +world.download.title=世界下载 - %1s world.export=导出此世界 world.export.title=选择该世界的存储位置 world.export.location=保存到 @@ -941,6 +942,7 @@ repositories.chooser=缺少 JavaFX 运行环境，HMCL 需要 JavaFX 才能正 repositories.chooser.title=选择 JavaFX 下载源 resourcepack=资源包 +resourcepack.download.title=资源包下载 - %1s search=搜索 search.hint.chinese=支持中英文搜索