From ad2a18f929bc3a0d9b28eb03213b3c0061cd34bf Mon Sep 17 00:00:00 2001
From: Antsiferov Andrew <summet.dev@gmail.com>
Date: Tue, 23 Feb 2021 22:53:23 +0300
Subject: [PATCH] Fix player.locale to be default (#4768)

* fix player.locale == default

* Update NetClient.java
---
 core/src/mindustry/core/NetClient.java | 8 +++++++-
 core/src/mindustry/core/NetServer.java | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index d89b7f8481..e0cdfee91d 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -26,6 +26,7 @@ import mindustry.world.*;
 import mindustry.world.modules.*;
 
 import java.io.*;
+import java.util.*;
 import java.util.zip.*;
 
 import static mindustry.Vars.*;
@@ -73,9 +74,14 @@ public class NetClient implements ApplicationListener{
                 disconnectQuietly();
             });
 
+            String locale = Core.settings.getString("locale");
+            if(locale.equals("default")){
+                locale = Locale.getDefault().toString();
+            }
+
             ConnectPacket c = new ConnectPacket();
             c.name = player.name;
-            c.locale = Core.settings.getString("locale");
+            c.locale = locale;
             c.mods = mods.getModStrings();
             c.mobile = mobile;
             c.versionType = Version.type;
diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 9ce38aa62a..daf6582dbc 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -196,7 +196,7 @@ public class NetServer implements ApplicationListener{
             }
 
             if(packet.locale == null){
-                packet.locale = "en_US";
+                packet.locale = "en";
             }
 
             String ip = con.address;