From 7c027634ab50fd732539632702c5108e48b629a6 Mon Sep 17 00:00:00 2001 From: Rheimus Date: Tue, 7 Apr 2020 20:34:24 +1200 Subject: [PATCH] #175 Fix config loading of locale strings --- src/main/java/com/superzanti/serversync/SyncConfig.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/superzanti/serversync/SyncConfig.java b/src/main/java/com/superzanti/serversync/SyncConfig.java index c4ba4528..6b271611 100644 --- a/src/main/java/com/superzanti/serversync/SyncConfig.java +++ b/src/main/java/com/superzanti/serversync/SyncConfig.java @@ -272,7 +272,13 @@ private void writeConfig() { private void init() { String couldNotFindString = "Could not find %s config entry"; try { - LOCALE = new Locale(config.getEntryByName("LOCALE").getString()); + String localeString = config.getEntryByName("LOCALE").getString(); + String[] localeParts = localeString.split("_"); + if (localeParts.length != 2) { + Logger.error("Malformed locale string!"); + localeParts = new String[]{"en", "US"}; + } + LOCALE = new Locale(localeParts[0], localeParts[1]); } catch (NullPointerException e) { Logger.debug(String.format(couldNotFindString, "LOCALE")); isUsingIncompatableConfig = true;