Skip to content

Commit bb37e3f

Browse files
authored
Use StringUtils.isASCII to check if a string contains non-ASCII characters (#3931)
1 parent 942f7b7 commit bb37e3f

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.jackhuang.hmcl.ui.construct.RequiredValidator;
2828
import org.jackhuang.hmcl.ui.construct.Validator;
2929
import org.jackhuang.hmcl.ui.wizard.WizardController;
30+
import org.jackhuang.hmcl.util.StringUtils;
3031

31-
import java.nio.charset.StandardCharsets;
3232
import java.util.Map;
3333

3434
import static javafx.beans.binding.Bindings.createBooleanBinding;
@@ -81,7 +81,7 @@ protected void onInstall() {
8181
String name = txtName.getText();
8282

8383
// Check for non-ASCII characters.
84-
if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) {
84+
if (!StringUtils.isASCII(name)) {
8585
Controllers.dialog(new MessageDialogPane.Builder(
8686
i18n("install.name.invalid"),
8787
i18n("message.warning"),

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
import java.io.File;
4444
import java.nio.charset.Charset;
45-
import java.nio.charset.StandardCharsets;
4645
import java.util.Map;
4746
import java.util.Optional;
4847

@@ -153,7 +152,7 @@ protected void onInstall() {
153152
String name = txtModpackName.getText();
154153

155154
// Check for non-ASCII characters.
156-
if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) {
155+
if (!StringUtils.isASCII(name)) {
157156
Controllers.dialog(new MessageDialogPane.Builder(
158157
i18n("install.name.invalid"),
159158
i18n("message.warning"),

0 commit comments

Comments
 (0)