From bea4ef3cde10ad06c4fb549996dc46afd2351e3c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 15 Aug 2017 02:42:36 -0400 Subject: [PATCH] v0.6.1: game now auto-selects languages even if they are unreviewed --- .../shatteredpixeldungeon/ShatteredPixelDungeon.java | 9 +++------ .../shatteredpixeldungeon/messages/Languages.java | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index 9d76ff58d..ab05aa1bc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -406,13 +406,10 @@ public class ShatteredPixelDungeon extends Game { public static Languages language() { String code = Preferences.INSTANCE.getString(Preferences.KEY_LANG, null); if (code == null){ - Languages lang = Languages.matchLocale(Locale.getDefault()); - if (lang.status() == Languages.Status.REVIEWED) - return lang; - else - return Languages.ENGLISH; + return Languages.matchLocale(Locale.getDefault()); + } else { + return Languages.matchCode(code); } - else return Languages.matchCode(code); } public static void classicFont(boolean classic){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java index 348290b17..88fec9e3f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java @@ -26,11 +26,11 @@ import java.util.Locale; public enum Languages { ENGLISH("english", "", Status.REVIEWED, null, null), - RUSSIAN("русский", "ru", Status.REVIEWED, new String[]{"ConsideredHamster", "Inevielle", "yarikonline"}, new String[]{"AttHawk46", "HerrGotlieb", "Shamahan", "un_logic"}), + RUSSIAN("русский", "ru", Status.UNREVIEWED, new String[]{"ConsideredHamster", "Inevielle", "yarikonline"}, new String[]{"AttHawk46", "HerrGotlieb", "Shamahan", "un_logic"}), KOREAN("한국어", "ko", Status.REVIEWED, new String[]{"Flameblast12"}, new String[]{"WondarRabb1t", "ddojin0115", "eeeei", "linterpreteur", "lsiebnie" }), CHINESE("中文", "zh", Status.REVIEWED, new String[]{"Jinkeloid(zdx00793)"}, new String[]{"931451545", "HoofBumpBlurryface", "Lery", "Lyn-0401", "ShatteredFlameBlast", "hmdzl001", "tempest102"}), FINNISH("suomi", "fi", Status.REVIEWED, new String[]{"TenguTheKnight"}, null ), - POLISH("polski", "pl", Status.REVIEWED, new String[]{"Deksippos", "kuadziw"}, new String[]{"Chasseur", "Darden", "MJedi", "Scharnvirk", "Shmilly", "dusakus", "michaub", "ozziezombie", "szczoteczka22", "szymex73"}), + POLISH("polski", "pl", Status.INCOMPLETE, new String[]{"Deksippos", "kuadziw"}, new String[]{"Chasseur", "Darden", "MJedi", "Scharnvirk", "Shmilly", "dusakus", "michaub", "ozziezombie", "szczoteczka22", "szymex73"}), ITALIAN("italiano", "it", Status.UNREVIEWED, new String[]{"bizzolino", "funnydwarf"}, new String[]{"4est", "DaniMare", "Danzl", "andrearubbino00", "nessunluogo", "umby000"}), ESPERANTO("esperanto", "eo", Status.UNREVIEWED, new String[]{"Verdulo"}, null),