From 0690e23116066957d8de94f4cf6896b545596178 Mon Sep 17 00:00:00 2001
From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com>
Date: Sat, 7 May 2022 12:20:44 +0800
Subject: [PATCH] Handle with undetermined locale language config (#611)
* Update GiveAllCommand.java
giveall command nomore give arts
* Update Grasscutter.java
* Update Grasscutter.java
---
src/main/java/emu/grasscutter/Grasscutter.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index 823633c4..89c4d8a2 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -149,7 +149,13 @@ public final class Grasscutter {
public static void loadLanguage() {
var locale = config.LocaleLanguage;
- language = Language.getLanguage(locale.toLanguageTag());
+ String languageTag = locale.toLanguageTag();
+ if (languageTag.equals("und")) {
+ Grasscutter.getLogger().error("Illegal locale language, using en-US instead.");
+ language = Language.getLanguage("en-US");
+ } else {
+ language = Language.getLanguage(languageTag);
+ }
}
public static void saveConfig() {
--
GitLab