From 1dad6b27c77690b9eb2663cd4276636d40c37926 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 19 Jan 2018 12:38:07 -0500
Subject: [PATCH] GWT compilation fixes

---
 .../src/io/anuke/mindustry/AndroidLauncher.java |   6 ++++++
 core/assets-raw/sprites/ui/text-sides-down.png  | Bin 742 -> 697 bytes
 .../io/anuke/mindustry/io/PlatformFunction.java |   2 ++
 .../mindustry/ui/dialogs/LanguageDialog.java    |   4 ++--
 .../mindustry/desktop/DesktopLauncher.java      |   6 ++++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java
index 53ee5b9295..b7071205f2 100644
--- a/android/src/io/anuke/mindustry/AndroidLauncher.java
+++ b/android/src/io/anuke/mindustry/AndroidLauncher.java
@@ -21,6 +21,7 @@ import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 public class AndroidLauncher extends AndroidApplication{
 	boolean doubleScaleTablets = true;
@@ -60,6 +61,11 @@ public class AndroidLauncher extends AndroidApplication{
 				TextFieldDialogListener.add(field, 0, length);
 			}
 
+			@Override
+			public String getLocaleName(Locale locale){
+				return locale.getDisplayName(locale);
+			}
+
 			@Override
 			public void openDonations() {
 				showDonations();
diff --git a/core/assets-raw/sprites/ui/text-sides-down.png b/core/assets-raw/sprites/ui/text-sides-down.png
index a35bd776ff48ce4a1e43f763111bc736a84599ab..80f894c71babaf0e786c8dd395281e8da7eb9938 100644
GIT binary patch
delta 623
zcmaFHx|3D0Gr-TCmrII^fq{Y7)59f*fq@}~fq_AkgN=cKVZ$76gNcg9?5teE6Zlqz
zPmI>6SM+po49U3nHez?~VFLkMNjb%W>1wIZ7W@ifGineEc&HeZ!pN`SFtxg<Z%W=B
z$y<$@PlWZBTTh%arJvc(p+VP9_GGzz=YzfNJ^LHqbocc1SUWrZmq>PFc|OO=&9cVk
z+0F^Q)s7i&SGam4Gc@R`&*M9P_`&Jh?Ki4Tjz?uP)-x>7Ijt{z`S-2-C*F@mQX~5+
z49~AMU3OOfQd?7YPLJfAO&8}Z+{>ZBug_VMd`r#r->f_L8y57=KPC4>F@3e=<C>kH
zOg>Nao2@!$>ooV<4Ua!^FffFMs@^>Ed|A%Xf@v1d!&3JcE<2!O5x?%kmmSg{dkkw&
z&MIO%-@}kEc&)FlUN7VJw)^|seBaD&bM4rEk>|Sa@@uvxCoF?fyaXkLPsW@uJu)T7
zbKB}wv*yZ{UhZX@n!Ws`nMvupwg1Y+=R{;jZR~sSXQ`^w?Af=j-s9M6)xRyt>#i?%
zyt(WgzTGEHgZ5@_y_xY;J!D?S<w=VSmij2T7cbfxrYm|$!tKW$kL9oHJ!<Z$XPHag
zzmPHi6{q3K9ZSv}DXKi8ck<K}oo>z2l}qPl_07>;mVLM6!@pk&R!1$vC6a5-OD><i
zh4WY9imxJ>mo=HP9~b`?yO(`i?A!0Z8TK{$Uz+`drCZC+iAEh0@SCrgQE_VW4Q+$q
z4^f}9%~dBac@eYvqy9$MtrO=g{F-ES=l`6=!s}Bm^vllGu}t&KePwvu`A>8&d(o+j
ho^D`p%>JNy{I81>^xo}Q%D}+D;OXk;vd$@?2>?ZfAU^;A

delta 668
zcmdnV`ixbvGr-TCmrII^fq{Y7)59f*fq|iifq_AkgN=cKVaiIjtrHcE*_kY5K2AMS
zJTY3M-p|v;F(l*O+sKW%hYbXlu=ES;@Sc3BIG|RGS@Hn)jt>Hwn;O^*4xHL+>we1Q
zCDZ!@B5b|pUzfbo<SOj3cWBVPxBtZd$CDTJtmJvWH}DR-i8xoQ)53}blVq0cw-4^U
zENPnaJZGobsm|MiyA9?4vnJOr|EPb~f8|}Kf>+Bq-fpOmj(xv(U;U;#BF`&qq>_7H
z?s}Kj@TKlm`GexOBC*$bD>`D=ZoBgNc+%v@5!n-;RI8<*oe|sJ@pMCUtiETe;}4E@
zHoK`UBKy_8uNO?3y4sGTy=d{CUxvHI1iM)@H`dht@34qT%H~}7zWVa_y%vcF`)(cI
zXK{b&`Nv6zIGG-DsMY6%ndGjE@f4c1T53-0%6!hO@cy%D#l=@&J&v#sZkkZUVivbY
zrI7RPyYojI9dm-`RIn*eRbYQUr|?{;XT_WD&$g}!!H?Q*c(!iScu~=;@%?FK<=^_B
zwPM98N)LW)UFGm6=au<ax9M81OEeenD|)=R&?_{#<?x;zKi>Y!;oGfRFVnp(ZRf1j
zJ;#hCW`5nN@?;w0y4+VmF25DG&M&Ogzg4!y^mJ%UZxO${MesDiDbnYEXomU*EuFAb
z$Mj&4x4@y9o8CsK@U=;0uf6~7{Ikco5$`5AFYkUUtj*CP%sx}@&eCrtF+nO!9$Tls
zn|;Xk`JBl0*PA~cNq%_F;n9tjmLR?KLyloAN!L5HeGIs!s>Q6xcy@2Y!deGyLG#_&
zxjorGomvzGxzB1ViDfWnul=fNxG>!)M(O>_%Lk^M=eXpnZ{((8=h5^0)M}@N0U9D)
ftxg{={9v`*Y9@0cZrfP~1_lOCS3j3^P6<r_TFg0G

diff --git a/core/src/io/anuke/mindustry/io/PlatformFunction.java b/core/src/io/anuke/mindustry/io/PlatformFunction.java
index 55f97594eb..bba3c1e087 100644
--- a/core/src/io/anuke/mindustry/io/PlatformFunction.java
+++ b/core/src/io/anuke/mindustry/io/PlatformFunction.java
@@ -3,6 +3,7 @@ package io.anuke.mindustry.io;
 import io.anuke.ucore.scene.ui.TextField;
 
 import java.util.Date;
+import java.util.Locale;
 
 public abstract class PlatformFunction{
 	public String format(Date date){return "invalid";}
@@ -17,4 +18,5 @@ public abstract class PlatformFunction{
 	public void onGameExit(){}
 	public void openDonations(){}
 	public void requestWritePerms(){}
+	public String getLocaleName(Locale locale){return locale.toString();}
 }
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
index 6c4bc8cf9d..9da7ae6dfd 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
@@ -1,5 +1,6 @@
 package io.anuke.mindustry.ui.dialogs;
 
+import io.anuke.mindustry.Mindustry;
 import io.anuke.mindustry.Vars;
 import io.anuke.ucore.UCore;
 import io.anuke.ucore.core.Settings;
@@ -29,8 +30,7 @@ public class LanguageDialog extends FloatingDialog{
         ButtonGroup<TextButton> group = new ButtonGroup<>();
 
         for(Locale loc : locales){
-            TextButton button = new TextButton(loc.getDisplayName(loc), "toggle");
-            UCore.log(loc.getDisplayName(loc));
+            TextButton button = new TextButton(Mindustry.platforms.getLocaleName(loc), "toggle");
             button.setChecked(Vars.ui.getLocale().equals(loc));
             button.clicked(() -> {
                 if(Vars.ui.getLocale().equals(loc)) return;
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
index d62cbd4c31..75e5b63bcf 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -27,6 +27,7 @@ import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 public class DesktopLauncher {
 	
@@ -86,6 +87,11 @@ public class DesktopLauncher {
 				JOptionPane.showMessageDialog(null, text);
 			}
 
+			@Override
+			public String getLocaleName(Locale locale){
+				return locale.getDisplayName(locale);
+			}
+
 			@Override
 			public void updateRPC() {
 				DiscordRichPresence presence = new DiscordRichPresence();