From 30168ee7b01efdadbb4e4b6da247b70211acfe9c Mon Sep 17 00:00:00 2001 From: Ghost_chu <2908803755@qq.com> Date: Thu, 10 Jun 2021 20:00:43 +0800 Subject: [PATCH] Fixed #1059 --- .../quickshop/util/language/game/MojangGameLanguageImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/maxgamer/quickshop/util/language/game/MojangGameLanguageImpl.java b/src/main/java/org/maxgamer/quickshop/util/language/game/MojangGameLanguageImpl.java index 5b9308181..dc501f66f 100644 --- a/src/main/java/org/maxgamer/quickshop/util/language/game/MojangGameLanguageImpl.java +++ b/src/main/java/org/maxgamer/quickshop/util/language/game/MojangGameLanguageImpl.java @@ -25,6 +25,7 @@ import com.google.gson.JsonParser; import lombok.Getter; import lombok.SneakyThrows; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.enchantments.Enchantment; @@ -69,6 +70,10 @@ public class MojangGameLanguageImpl extends BukkitGameLanguageImpl implements Ga if ("default".equalsIgnoreCase(languageCode)) { Locale locale = Locale.getDefault(); languageCode = locale.getLanguage() + "_" + locale.getCountry(); + if (StringUtils.isEmpty(locale.getCountry())) { + languageCode = locale.toLanguageTag(); + plugin.getLogger().info("Your system offer empty data about local country, we will fallback to system language default country, current language set to " + languageCode + ". If it incorrect, please edit it in config.yml."); + } } languageCode = languageCode.replace("-", "_").toLowerCase(Locale.ROOT); lock.lock();