From d167c712a69d2886a460f48f31a87cebf63da24c Mon Sep 17 00:00:00 2001 From: Glavo Date: Sat, 23 Oct 2021 21:44:09 +0800 Subject: [PATCH] Improved Java path display when no suitable Java is found --- .../org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java | 3 ++- HMCL/src/main/resources/assets/lang/I18N.properties | 1 + HMCL/src/main/resources/assets/lang/I18N_zh.properties | 1 + HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java index 35353a80d..6c3670872 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java @@ -758,7 +758,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag profile.getRepository().getVersion(versionId)); } }).thenAcceptAsync(Schedulers.javafx(), javaVersion -> javaSublist.setSubtitle(Optional.ofNullable(javaVersion) - .map(JavaVersion::getBinary).map(Path::toString).orElse(i18n("settings.game.java_directory.invalid")))) + .map(JavaVersion::getBinary).map(Path::toString).orElseGet(() -> + autoSelected ? i18n("settings.game.java_directory.auto.not_found") : i18n("settings.game.java_directory.invalid")))) .start(); } diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index eedd908a3..5ac17eacc 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -848,6 +848,7 @@ settings.game.exploration=Explore settings.game.fullscreen=Fullscreen settings.game.java_directory=Java Directory settings.game.java_directory.auto=Automatically selected +settings.game.java_directory.auto.not_found=No suitable Java settings.game.java_directory.bit=%s-Bit settings.game.java_directory.choose=Choose Java Directory. settings.game.java_directory.invalid=Invalid Java Path diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index b42b935d7..ea717f427 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -847,6 +847,7 @@ settings.game.exploration=瀏覽 settings.game.fullscreen=全螢幕 settings.game.java_directory=Java 路徑 settings.game.java_directory.auto=自動選擇合適的 Java +settings.game.java_directory.auto.not_found=沒有合適的 Java settings.game.java_directory.bit=%s 位 settings.game.java_directory.choose=選擇 Java 路徑 settings.game.java_directory.invalid=Java 路徑不正確 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 d70dae803..798a03c70 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -847,6 +847,7 @@ settings.game.exploration=浏览 settings.game.fullscreen=全屏 settings.game.java_directory=Java 路径 settings.game.java_directory.auto=自动选择合适的 Java +settings.game.java_directory.auto.not_found=没有合适的 Java settings.game.java_directory.bit=%s 位 settings.game.java_directory.choose=选择 Java 路径 settings.game.java_directory.invalid=Java 路径不正确