diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModCheckUpdatesTask.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModCheckUpdatesTask.java index 72e5f03242..86806951c6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModCheckUpdatesTask.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModCheckUpdatesTask.java @@ -39,13 +39,13 @@ public ModCheckUpdatesTask(String gameVersion, Collection mods) { .map(type -> Task.supplyAsync(() -> mod.checkUpdates(gameVersion, type.getRemoteModRepository())) .setSignificance(TaskSignificance.MAJOR) - .setName(String.format("%s (%s)", mod.getFileName(), type.name())).withCounter("mods.check_updates") + .setName(String.format("%s (%s)", mod.getFileName(), type.name())).withCounter("update.checking") ) .collect(Collectors.toList()) ) .collect(Collectors.toList()); - setStage("mods.check_updates"); + setStage("update.checking"); getProperties().put("total", dependents.size() * RemoteMod.Type.values().length); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java index 5ce5eddbd1..4b6695c089 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java @@ -199,8 +199,8 @@ public void checkUpdates() { Controllers.navigate(new ModUpdatesPage(modManager, result)); } }) - .withStagesHint(Collections.singletonList("mods.check_updates")), - i18n("update.checking"), TaskCancellationAction.NORMAL); + .withStagesHint(Collections.singletonList("update.checking")), + i18n("mods.check_updates"), TaskCancellationAction.NORMAL); if (profile.getRepository().isModpack(versionId)) { Controllers.confirm( 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 31a37da3a1..3652fa7c26 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 @@ -143,7 +143,7 @@ class ModListPageSkin extends SkinBase { createToolbarButton2(i18n("button.refresh"), SVG.REFRESH, skinnable::refresh), createToolbarButton2(i18n("mods.add"), SVG.ADD, skinnable::add), createToolbarButton2(i18n("button.reveal_dir"), SVG.FOLDER_OPEN, skinnable::openModFolder), - createToolbarButton2(i18n("mods.check_updates"), SVG.UPDATE, skinnable::checkUpdates), + createToolbarButton2(i18n("mods.check_updates.button"), SVG.UPDATE, skinnable::checkUpdates), createToolbarButton2(i18n("download"), SVG.DOWNLOAD, skinnable::download), createToolbarButton2(i18n("search"), SVG.SEARCH, () -> changeToolbar(searchBar)) ); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java index 05209706f5..fa282275b4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java @@ -112,7 +112,7 @@ public ModUpdatesPage(ModManager modManager, List update JFXButton exportListButton = FXUtils.newRaisedButton(i18n("button.export")); exportListButton.setOnAction(e -> exportList()); - JFXButton nextButton = FXUtils.newRaisedButton(i18n("mods.check_updates.update")); + JFXButton nextButton = FXUtils.newRaisedButton(i18n("mods.check_updates.confirm")); nextButton.setOnAction(e -> updateMods()); JFXButton cancelButton = FXUtils.newRaisedButton(i18n("button.cancel")); @@ -148,7 +148,7 @@ private void updateMods() { Controllers.dialog(i18n("install.success")); } }), - i18n("mods.check_updates.update"), + i18n("mods.check_updates"), TaskCancellationAction.NORMAL); } @@ -277,7 +277,7 @@ public static class ModUpdateTask extends Task { private final List failedMods = new ArrayList<>(); ModUpdateTask(ModManager modManager, List> mods) { - setStage("mods.check_updates.update"); + setStage("mods.check_updates.confirm"); getProperties().put("total", mods.size()); this.dependents = new ArrayList<>(); @@ -309,7 +309,7 @@ public static class ModUpdateTask extends Task { failedMods.add(local); } }) - .withCounter("mods.check_updates.update")); + .withCounter("mods.check_updates.confirm")); } } diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index d43c5f0114..c6935659a2 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -1046,7 +1046,9 @@ mods.category=Category mods.channel.alpha=Alpha mods.channel.beta=Beta mods.channel.release=Release -mods.check_updates=Update +mods.check_updates=Mod update process +mods.check_updates.button=Update +mods.check_updates.confirm=Update mods.check_updates.current_version=Current Version mods.check_updates.empty=All mods are up-to-date mods.check_updates.failed_check=Failed to check for updates. @@ -1054,7 +1056,6 @@ mods.check_updates.failed_download=Failed to download some files. mods.check_updates.file=File mods.check_updates.source=Source mods.check_updates.target_version=Target Version -mods.check_updates.update=Update mods.choose_mod=Choose mod mods.curseforge=CurseForge mods.dependency.embedded=Built-in Dependencies (Already packaged in the mod file by the author. No need to download separately) @@ -1414,7 +1415,7 @@ update.channel.nightly.hint=You are currently using a Nightly channel build of t Follow @huanghongxun on Bilibili to stay up to date on important HMCL news, or @Glavo to learn about HMCL development progress. update.channel.nightly.title=Nightly Channel Notice update.channel.stable=Release -update.checking=Checking for Updates +update.checking=Checking for updates update.failed=Failed to update update.found=Update Available! update.newest_version=Latest version: %s diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index 638cfa87fa..6a913add79 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -1036,7 +1036,9 @@ mods.category=Categoría mods.channel.alpha=Alpha mods.channel.beta=Beta mods.channel.release=Release -mods.check_updates=Actualizar +mods.check_updates=Proceso de actualización de mods +mods.check_updates.button=Actualizar +mods.check_updates.confirm=Actualizar mods.check_updates.current_version=Versión actual mods.check_updates.empty=Todos los mods están actualizados mods.check_updates.failed_check=No se ha podido comprobar si hay actualizaciones. @@ -1044,7 +1046,6 @@ mods.check_updates.failed_download=No se han podido descargar algunos de los arc mods.check_updates.file=Archivo mods.check_updates.source=Fuente mods.check_updates.target_version=Versión de destino -mods.check_updates.update=Actualización mods.choose_mod=Elige un mod mods.curseforge=CurseForge mods.dependency.embedded=Dependencias incorporadas (Already packaged in the mod file by the author. No need to download separately) diff --git a/HMCL/src/main/resources/assets/lang/I18N_ja.properties b/HMCL/src/main/resources/assets/lang/I18N_ja.properties index 61879f2de3..d449bb1a6d 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ja.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ja.properties @@ -664,13 +664,14 @@ mods.add.failed=mods %s の追加に失敗しました。 mods.add.success=mods %s が正常に追加されました。 mods.category=Category mods.check_updates=更新を確認 +mods.check_updates.button=更新 +mods.check_updates.confirm=更新 mods.check_updates.current_version=Current mods.check_updates.failed_check=更新のチェックに失敗しました mods.check_updates.failed_download=一部のファイルのダウンロードに失敗しました mods.check_updates.file=ファイル mods.check_updates.source=Source mods.check_updates.target_version=Target -mods.check_updates.update=更新 mods.choose_mod=modを選択してください mods.curseforge=CurseForge mods.disable=無効にする diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index 0c017e1b46..5e871975d3 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -1035,6 +1035,8 @@ mods.channel.alpha=Альфа mods.channel.beta=Бета mods.channel.release=Релиз mods.check_updates=Проверить обновления +mods.check_updates.button=Обновить +mods.check_updates.confirm=Обновить mods.check_updates.current_version=Текущая версия mods.check_updates.empty=Все моды новейшие mods.check_updates.failed_check=Не удалось проверить обновления. @@ -1042,7 +1044,6 @@ mods.check_updates.failed_download=Не удалось скачать некот mods.check_updates.file=Файл mods.check_updates.source=Источник mods.check_updates.target_version=Целевая версия -mods.check_updates.update=Обновить mods.choose_mod=Выберите мод mods.curseforge=CurseForge mods.dependency.embedded=Встроенные зависимости (Уже упакован в файл мода автором. Нет необходимости скачивать отдельно.) diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index d3dc0ed927..db401d9afc 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -843,7 +843,9 @@ mods.category=類別 mods.channel.alpha=Alpha mods.channel.beta=Beta mods.channel.release=Release -mods.check_updates=檢查模組更新 +mods.check_updates=模組更新檢查 +mods.check_updates.button=檢查更新 +mods.check_updates.confirm=更新 mods.check_updates.current_version=目前版本 mods.check_updates.empty=沒有需要更新的模組 mods.check_updates.failed_check=檢查更新失敗 @@ -851,7 +853,6 @@ mods.check_updates.failed_download=部分檔案下載失敗 mods.check_updates.file=檔案 mods.check_updates.source=來源 mods.check_updates.target_version=目標版本 -mods.check_updates.update=更新 mods.choose_mod=選取模組 mods.curseforge=CurseForge mods.dependency.embedded=內建相依模組 (作者已經打包在模組檔中,無需單獨下載) 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 f1764307c1..072ec47877 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -853,7 +853,9 @@ mods.category=类别 mods.channel.alpha=快照版本 mods.channel.beta=测试版本 mods.channel.release=稳定版本 -mods.check_updates=检查模组更新 +mods.check_updates=模组更新检查 +mods.check_updates.button=检查更新 +mods.check_updates.confirm=更新 mods.check_updates.current_version=当前版本 mods.check_updates.empty=没有需要更新的模组 mods.check_updates.failed_check=检查更新失败 @@ -861,7 +863,6 @@ mods.check_updates.failed_download=部分文件下载失败 mods.check_updates.file=文件 mods.check_updates.source=来源 mods.check_updates.target_version=目标版本 -mods.check_updates.update=更新 mods.choose_mod=选择模组 mods.curseforge=CurseForge mods.dependency.embedded=内置的前置模组 (已经由作者打包在模组文件中,无需另外下载)