LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.1: game now auto-selects languages even if they are unreviewed

Browse Source
This commit is contained in:
Evan Debenham 2017-08-15 02:42:36 -04:00
parent 340c716c49
commit bea4ef3cde
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -406,13 +406,10 @@ public class ShatteredPixelDungeon extends Game {
public static Languages language() { public static Languages language() {
String code = Preferences.INSTANCE.getString(Preferences.KEY_LANG, null); String code = Preferences.INSTANCE.getString(Preferences.KEY_LANG, null);
if (code == null){ if (code == null){
Languages lang = Languages.matchLocale(Locale.getDefault()); return Languages.matchLocale(Locale.getDefault());
if (lang.status() == Languages.Status.REVIEWED) } else {
return lang; return Languages.matchCode(code);
else
return Languages.ENGLISH;
} }
else return Languages.matchCode(code);
} }
public static void classicFont(boolean classic){ public static void classicFont(boolean classic){

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java
View File

@ -26,11 +26,11 @@ import java.util.Locale;
public enum Languages { public enum Languages {
ENGLISH("english", "", Status.REVIEWED, null, null), 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" }), 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"}), 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 ), 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"}), 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), ESPERANTO("esperanto", "eo", Status.UNREVIEWED, new String[]{"Verdulo"}, null),