#175 Fix config loading of locale strings

superzanti · Apr 7, 2020 · 7c02763 · 7c02763
1 parent 5e46826
commit 7c02763
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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;