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 a35bd776ff..80f894c71b 100644 Binary files a/core/assets-raw/sprites/ui/text-sides-down.png and b/core/assets-raw/sprites/ui/text-sides-down.png differ 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 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();