From 6fae131287dfc4a24f4771e1d8a5516f9e2f567f Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sat, 30 Jun 2018 15:27:58 +0800 Subject: [PATCH] Display (None) instead of empty string if no Yggdrasil server is available when adding account --- HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java | 1 + HMCL/src/main/resources/assets/lang/I18N.properties | 2 ++ HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 2 ++ 3 files changed, 5 insertions(+) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java index cb6c19f33..732efb929 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java @@ -82,6 +82,7 @@ public class AddAccountPane extends StackPane { cboServers.setCellFactory(jfxListCellFactory(server -> new TwoLineListItem(server.getName(), server.getUrl()))); cboServers.setConverter(stringConverter(AuthlibInjectorServer::getName)); cboServers.setItems(Settings.SETTINGS.authlibInjectorServers); + cboServers.setPromptText(Launcher.i18n("general.prompt.empty")); // workaround: otherwise the combox will be black if (!cboServers.getItems().isEmpty()) diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 14d4c27a2..013c0a68b 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -99,6 +99,8 @@ folder.resourcepacks=Resourcepacks folder.saves=Saves folder.screenshots=Screenshots +general.prompt.empty=(None) + input.email=The username must be an e-mail. input.number=Must be a number. input.not_empty=Required field 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 d2f0aeb43..3871c9cb3 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -99,6 +99,8 @@ folder.resourcepacks=资源包文件夹 folder.saves=存档文件夹 folder.screenshots=截图文件夹 +general.prompt.empty=（无） + input.email=用户名必须是邮箱 input.number=必须是数字 input.not_empty=必填项