From a3d23d3aa7ee679d074b393362e146dee6916faa Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 7 Mar 2023 15:21:57 -0500 Subject: [PATCH] v2.0.0: updated constant naming for languages --- .../messages/Languages.java | 42 +++++++++---------- .../scenes/TitleScene.java | 6 +-- .../windows/WndSettings.java | 10 ++--- 3 files changed, 29 insertions(+), 29 deletions(-) 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 3ef42dbe1..939eac8c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java @@ -24,36 +24,36 @@ package com.shatteredpixel.shatteredpixeldungeon.messages; import java.util.Locale; public enum Languages { - ENGLISH("english", "", Status._REVIEWED_, null, null), + ENGLISH("english", "", Status._COMPLETE_, null, null), CHINESE("中文", "zh", Status.UNREVIEWED, new String[]{"Jinkeloid(zdx00793)", "endlesssolitude"}, new String[]{"931451545", "Budding", "Chronie_Lynn_Iwa", "Fatir", "Fishbone", "Hcat", "HoofBumpBlurryface", "Lery", "Lyn_0401", "Ooooscar", "ShatteredFlameBlast", "SpaceAnchor", "hmdzl001", "leo", "tempest102", "户方狸奴"}), - KOREAN("한국어", "ko", Status.INCOMPLETE, new String[]{"Cocoa", "Flameblast12", "GameConqueror", "Korean2017"}, new String[]{"AFS", "N8fall", "WondarRabb1t", "chlrhwnstkd", "ddojin0115", "eeeei", "enjuxx", "hancyel", "linterpreteur", "lsiebnie", "sora0430"}), - RUSSIAN("русский", "ru", Status._REVIEWED_, new String[]{"ConsideredHamster", "Inevielle", "apxwn", "yarikonline" }, new String[]{"AttHawk46", "BlueberryShortcake", "Dominowood371", "Enwviun", "HerrGotlieb", "HoloTheWise", "Ilbko", "JleHuBbluKoT", "KirStaLong", "MrXantar", "Nikets", "Originalej0name", "Raymundo", "Shamahan", "Thomasg63", "XAutumn", "Ya6lo4ko", "dasfan123", "ifritdiezel", "kirusyaga", "long_live_the_9", "perefrazz", "roman.yagodin", "un_logic", "vivatimperia", "Вoвa"}), - SPANISH("español", "es", Status._REVIEWED_, new String[]{"KeyKai", "Kiroto", "Kohru", "airman12", "grayscales"}, new String[]{"2001sergiobr", "AdventurerKilly", "Alesxanderk", "Bryan092", "CorvosUtopy", "D0n.Kak0", "Dewstend", "Dyrran", "Enddox", "Fervoreking", "Illyatwo2", "JPCHZ", "LastCry", "Marquezo_577_284", "NAVI1237", "STKmonoqui", "Sh4rkill3r", "alfongad", "anauta", "benzarr410", "chepe567.jc", "ctrijueque", "damc0616", "desen90", "dhg121", "javifs", "jonismack1", "magmax", "rechebeltran", "tres.14159"}), - GERMAN("deutsch", "de", Status._REVIEWED_, new String[]{"Dallukas", "KrystalCroft", "Wuzzy", "Zap0", "apxwn", "bernhardreiter", "davedude"}, new String[]{"2711chrissi", "Abracadabra", "Ceeee", "DarkPixel", "ErichME", "Faquarl", "LenzB", "MacMoff", "Micksha", "Niseko", "Ordoviz", "Sarius", "SirEddi", "Sorpl3x", "SurmanPP", "SwissQ", "ThunfischGott", "Timo_S", "Topicranger", "azrdev", "carrageen", "dome.scheidler", "galactictrans", "gekko303", "jeinzi", "johannes.schobel", "karoshi42", "koryphea", "luciocarreras", "mklr", "niemand", "oragothen", "spixi", "unbekannterTyp"}), + KOREAN("한국어", "ko", Status.UNFINISHED, new String[]{"Cocoa", "Flameblast12", "GameConqueror", "Korean2017"}, new String[]{"AFS", "N8fall", "WondarRabb1t", "chlrhwnstkd", "ddojin0115", "eeeei", "enjuxx", "hancyel", "linterpreteur", "lsiebnie", "sora0430"}), + RUSSIAN("русский", "ru", Status._COMPLETE_, new String[]{"ConsideredHamster", "Inevielle", "apxwn", "yarikonline" }, new String[]{"AttHawk46", "BlueberryShortcake", "Dominowood371", "Enwviun", "HerrGotlieb", "HoloTheWise", "Ilbko", "JleHuBbluKoT", "KirStaLong", "MrXantar", "Nikets", "Originalej0name", "Raymundo", "Shamahan", "Thomasg63", "XAutumn", "Ya6lo4ko", "dasfan123", "ifritdiezel", "kirusyaga", "long_live_the_9", "perefrazz", "roman.yagodin", "un_logic", "vivatimperia", "Вoвa"}), + SPANISH("español", "es", Status._COMPLETE_, new String[]{"KeyKai", "Kiroto", "Kohru", "airman12", "grayscales"}, new String[]{"2001sergiobr", "AdventurerKilly", "Alesxanderk", "Bryan092", "CorvosUtopy", "D0n.Kak0", "Dewstend", "Dyrran", "Enddox", "Fervoreking", "Illyatwo2", "JPCHZ", "LastCry", "Marquezo_577_284", "NAVI1237", "STKmonoqui", "Sh4rkill3r", "alfongad", "anauta", "benzarr410", "chepe567.jc", "ctrijueque", "damc0616", "desen90", "dhg121", "javifs", "jonismack1", "magmax", "rechebeltran", "tres.14159"}), + GERMAN("deutsch", "de", Status._COMPLETE_, new String[]{"Dallukas", "KrystalCroft", "Wuzzy", "Zap0", "apxwn", "bernhardreiter", "davedude"}, new String[]{"2711chrissi", "Abracadabra", "Ceeee", "DarkPixel", "ErichME", "Faquarl", "LenzB", "MacMoff", "Micksha", "Niseko", "Ordoviz", "Sarius", "SirEddi", "Sorpl3x", "SurmanPP", "SwissQ", "ThunfischGott", "Timo_S", "Topicranger", "azrdev", "carrageen", "dome.scheidler", "galactictrans", "gekko303", "jeinzi", "johannes.schobel", "karoshi42", "koryphea", "luciocarreras", "mklr", "niemand", "oragothen", "spixi", "unbekannterTyp"}), FRENCH("français", "fr", Status.UNREVIEWED, new String[]{"Emether", "TheKappaDuWeb", "Xalofar", "canc42", "kultissim", "minikrob"}, new String[]{"3raven", "Alsydis", "Axce", "Az_zahr", "Bastien72", "Basttee", "Dekadisk", "Draal", "Eragem", "Karnot", "Le_Valla", "Louson", "Martin.Bellet", "Neopolitan", "NoGi", "Nyrnx", "Pandaman516", "Petit_Chat", "RomTheMareep", "RunningColours", "Soeiz", "SpeagleZNT", "Tronche2Cake", "VRad", "Weende_Bellet", "Ygdrazil", "_nim_", "adamch", "antoine9298", "clexanis", "eloiseflo", "go11um", "hydrasho", "jazzzz", "levilbatard", "linterpreteur", "maeltur70", "marmous", "mcbaba29000", "mluzarreta", "panopano", "solthaar", "speagle", "typhr80", "vavavoum", "whereisfelix", "willi3725", "zM_"}), PORTUGUESE("português", "pt", Status.UNREVIEWED, new String[]{"NicholasPainek", "TDF2001", "matheus208"}, new String[]{"14NGiestas", "Aetheryll", "Andrew_px1", "Arthur_Mastriaga", "Bigode935", "Bionic64", "Chacal.Ex", "ChainedFreaK", "Derik", "DredgenVale", "ElefanteFome", "Helen0903", "JST", "MadHorus", "Maria_João", "MarkusCoisa", "Matie", "OtávioMoraes", "PingasOwner", "Piraldo", "Sr.BaconDelicioso", "Tete_Teli", "Tio_P_(Krampus)", "Zukkine", "ancientorange", "danypr23", "denis.gnl", "efverick", "gBiazon", "ismael.henriques12", "juniorsilve33", "mfcord", "nattlegal", "owenreilly", "rafazago", "renan408", "try31"}), - POLISH("polski", "pl", Status.INCOMPLETE, new String[]{"Deksippos", "MrKukurykpl", "kuadziw", "szymex73"}, new String[]{"Akmetari", "AntiTime", "Boguc", "Chasseur", "Ciechu", "Darden", "DarkKnightComes", "GRan0000", "I256I", "KarixDaii", "KrnąbrnyOlaf", "Lufix", "MJedi", "Odiihinia", "Ostsee0912", "Peperos", "ProPolishGamer", "RolsoN", "Scharnvirk", "VasteelXolotl", "Voyteq", "Wiiiiiii", "bogumilg", "bvader95", "chronon", "dusakus", "elchudy", "jajkoswinka", "michaub", "ozziezombie", "szczoteczka22", "taki1", "transportowiec96"}), - ITALIAN("italiano", "it", Status.INCOMPLETE, new String[]{"MottledElm", "NeoAugustus", "bizzolino", "funnydwarf", "inkubo87"}, new String[]{"4est", "Danelix", "DaniMare", "Danzl", "Eriliken", "Esse78", "Guiller124", "IoannesMaria", "Mat323", "Mister64", "Noostale", "andreafaffo", "andrearubbino00", "cantarini", "carinellialessandro31", "dmytro.tokayev", "mattiuw", "max1234ita", "nessunluogo", "righi.a", "umby000", "valerio.bozzolan"}), - TURKISH("türkçe", "tr", Status.INCOMPLETE, new String[]{"LokiofMillenium", "emrebnk", "gorkem_yılmaz"}, new String[]{"AGORAAA", "AchernarPrime", "AcuriousPotato", "MuratEfeYilmaz", "OzanAlkan", "T3kin5iZ", "TR_Muhittin", "ahmetbakicakir", "akkaya.mustafa", "alikeremozfidan", "alpekin98", "denizakalin", "eraysall402", "erdemozdemir98", "hasantahsin160", "immortalsamuraicn", "kayikyaki", "melezorus34", "mitux", "ryuga", "yasirckr85", "yukete"}), - JAPANESE("日本語", "ja", Status.INCOMPLETE, null, new String[]{"Gosamaru", "Otogiri", "Siraore_Rou", "amama", "daingewuvzeevisiddfddd", "grassedge", "kiyofumimanabe", "librada", "mocklike", "oz51199", "tomofumikitano"}), + POLISH("polski", "pl", Status.UNFINISHED, new String[]{"Deksippos", "MrKukurykpl", "kuadziw", "szymex73"}, new String[]{"Akmetari", "AntiTime", "Boguc", "Chasseur", "Ciechu", "Darden", "DarkKnightComes", "GRan0000", "I256I", "KarixDaii", "KrnąbrnyOlaf", "Lufix", "MJedi", "Odiihinia", "Ostsee0912", "Peperos", "ProPolishGamer", "RolsoN", "Scharnvirk", "VasteelXolotl", "Voyteq", "Wiiiiiii", "bogumilg", "bvader95", "chronon", "dusakus", "elchudy", "jajkoswinka", "michaub", "ozziezombie", "szczoteczka22", "taki1", "transportowiec96"}), + ITALIAN("italiano", "it", Status.UNFINISHED, new String[]{"MottledElm", "NeoAugustus", "bizzolino", "funnydwarf", "inkubo87"}, new String[]{"4est", "Danelix", "DaniMare", "Danzl", "Eriliken", "Esse78", "Guiller124", "IoannesMaria", "Mat323", "Mister64", "Noostale", "andreafaffo", "andrearubbino00", "cantarini", "carinellialessandro31", "dmytro.tokayev", "mattiuw", "max1234ita", "nessunluogo", "righi.a", "umby000", "valerio.bozzolan"}), + TURKISH("türkçe", "tr", Status.UNFINISHED, new String[]{"LokiofMillenium", "emrebnk", "gorkem_yılmaz"}, new String[]{"AGORAAA", "AchernarPrime", "AcuriousPotato", "MuratEfeYilmaz", "OzanAlkan", "T3kin5iZ", "TR_Muhittin", "ahmetbakicakir", "akkaya.mustafa", "alikeremozfidan", "alpekin98", "denizakalin", "eraysall402", "erdemozdemir98", "hasantahsin160", "immortalsamuraicn", "kayikyaki", "melezorus34", "mitux", "ryuga", "yasirckr85", "yukete"}), + JAPANESE("日本語", "ja", Status.UNFINISHED, null, new String[]{"Gosamaru", "Otogiri", "Siraore_Rou", "amama", "daingewuvzeevisiddfddd", "grassedge", "kiyofumimanabe", "librada", "mocklike", "oz51199", "tomofumikitano"}), UKRANIAN("українська", "uk", Status.UNREVIEWED, new String[]{"Oster"}, new String[]{"AlexFenixUA", "Dotsent", "Lyttym", "Sadsaltan1", "TarasUA", "TheGuyBill", "Tomfire", "Volkov", "ZverWolf", "_bor_", "alexfenixva", "ddmaster3463", "filalex77", "ingvarfed", "iu0v1", "lezzen", "oliolioxinfree", "so1der", "qweez", "romanokurg", "vlisivka", "yukete", "zhawty"}), CZECH("čeština", "cs", Status.UNREVIEWED, new String[]{"ObisMike", "novotnyvaclav"}, new String[]{"16cnovotny", "AshenShugar", "Autony", "Block_Vader", "Buba237", "Nerdiniel", "JStrange", "RealBrofessor", "Thorn_123", "chuckjirka", "emteckos2", "kristanka"}), - INDONESIAN("indonésien","in", Status.INCOMPLETE, new String[]{"rakapratama"}, new String[]{"INDRA_SYAHPUTRA", "Izulhaaq", "Taka31", "ZakyM313", "ZangieF347", "atmorojo", "di9526985", "esprogarap", "kirimaja", "nicoalvito", "oolek", "wisnugafur"}), - DUTCH("nederlands", "nl", Status.INCOMPLETE, new String[]{"AlbertBrand"}, new String[]{"AvanLieshout", "Blokheck011", "Frankwert", "Gehenna", "Mvharen", "Valco", "ZephyrZodiac", "link200023", "rmw", "th3f4llenh0rr0r"}), - HUNGARIAN("magyar", "hu", Status.INCOMPLETE, new String[]{"dorheim", "szalaik"}, new String[]{"Navetelen", "acszoltan111", "clarovani", "dhialub", "nanometer", "nardomaa", "savarall", "summoner001"}), + INDONESIAN("indonésien","in", Status.UNFINISHED, new String[]{"rakapratama"}, new String[]{"INDRA_SYAHPUTRA", "Izulhaaq", "Taka31", "ZakyM313", "ZangieF347", "atmorojo", "di9526985", "esprogarap", "kirimaja", "nicoalvito", "oolek", "wisnugafur"}), + DUTCH("nederlands", "nl", Status.UNFINISHED, new String[]{"AlbertBrand"}, new String[]{"AvanLieshout", "Blokheck011", "Frankwert", "Gehenna", "Mvharen", "Valco", "ZephyrZodiac", "link200023", "rmw", "th3f4llenh0rr0r"}), + HUNGARIAN("magyar", "hu", Status.UNFINISHED, new String[]{"dorheim", "szalaik"}, new String[]{"Navetelen", "acszoltan111", "clarovani", "dhialub", "nanometer", "nardomaa", "savarall", "summoner001"}), VIETNAMESE("tiếng việt","vi", Status.UNREVIEWED, new String[]{"Chuseko", "The_Hood", "nguyenanhkhoapythus"}, new String[]{"BlueSheepAlgodoo", "Phuc2401", "Teh_boi", "Toluu", "bruhwut", "buicongminh_t63", "deadlevel13", "h4ndy_c4ndy", "hniV", "khangxyz3g", "ngolamaz3", "nkhhu", "vdgiapp", "vtvinh24"}), - //FINNISH("suomi", "fi", Status.INCOMPLETE, new String[]{"TenguKnight"}, new String[]{"Allugaattori10", "Dakkus", "Jaskas123", "MailBoxGod", "Oftox", "Sautari", "Tikkari"} ), + //FINNISH("suomi", "fi", Status.UNFINISHED, new String[]{"TenguKnight"}, new String[]{"Allugaattori10", "Dakkus", "Jaskas123", "MailBoxGod", "Oftox", "Sautari", "Tikkari"} ), GREEK("ελληνικά", "el", Status.UNREVIEWED, new String[]{"Aeonius", "Saxy"}, new String[]{"DU_Clouds", "VasKyr", "YiorgosH", "fr3sh", "stefboi", "toumbo", "val.exe"}); - //CATALAN("català", "ca", Status.INCOMPLETE, new String[]{"Illyatwo2"}, new String[]{"Elosy", "n1ngu"}) - //GALICIAN("galego", "gl", Status.INCOMPLETE, new String[]{"xecarballido"}, null), - //BASQUE("euskara", "eu", Status.INCOMPLETE, new String[]{"Deathrevenge", "Osoitz"}, null), - //ESPERANTO("esperanto","eo", Status.INCOMPLETE, new String[]{"Verdulo"}, new String[]{"Raizin"}); + //CATALAN("català", "ca", Status.UNFINISHED, new String[]{"Illyatwo2"}, new String[]{"Elosy", "n1ngu"}) + //GALICIAN("galego", "gl", Status.UNFINISHED, new String[]{"xecarballido"}, null), + //BASQUE("euskara", "eu", Status.UNFINISHED, new String[]{"Deathrevenge", "Osoitz"}, null), + //ESPERANTO("esperanto","eo", Status.UNFINISHED, new String[]{"Verdulo"}, new String[]{"Raizin"}); public enum Status{ - //below 80% complete languages are not added. - INCOMPLETE, //80-99% complete - UNREVIEWED, //100% complete - _REVIEWED_ //100% reviewed + //below 80% translated languages are not added or removed + UNFINISHED, //80-99% translated + UNREVIEWED, //100% translated + _COMPLETE_ //100% reviewed } private String name; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 9232b26ca..f08e7d12f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -328,7 +328,7 @@ public class TitleScene extends PixelScene { public SettingsButton( Chrome.Type type, String label ){ super(type, label); - if (Messages.lang().status() == Languages.Status.INCOMPLETE){ + if (Messages.lang().status() == Languages.Status.UNFINISHED){ icon(Icons.get(Icons.LANGS)); icon.hardlight(1.5f, 0, 0); } else { @@ -340,14 +340,14 @@ public class TitleScene extends PixelScene { public void update() { super.update(); - if (Messages.lang().status() == Languages.Status.INCOMPLETE){ + if (Messages.lang().status() == Languages.Status.UNFINISHED){ textColor(ColorMath.interpolate( 0xFFFFFF, CharSprite.NEGATIVE, 0.5f + (float)Math.sin(Game.timeTotal*5)/2f)); } } @Override protected void onClick() { - if (Messages.lang().status() == Languages.Status.INCOMPLETE){ + if (Messages.lang().status() == Languages.Status.UNFINISHED){ WndSettings.last_index = 4; } ShatteredPixelDungeon.scene().add(new WndSettings()); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java index df6c4ad57..356f5092b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java @@ -174,7 +174,7 @@ public class WndSettings extends WndTabbed { protected void createChildren() { super.createChildren(); switch(Messages.lang().status()){ - case INCOMPLETE: + case UNFINISHED: icon.hardlight(1.5f, 0, 0); break; case UNREVIEWED: @@ -1072,13 +1072,13 @@ public class WndSettings extends WndTabbed { txtLangInfo = PixelScene.renderTextBlock(6); String info = "_" + Messages.titleCase(currLang.nativeName()) + "_ - "; if (currLang == Languages.ENGLISH) info += "This is the source language, written by the developer."; - else if (currLang.status() == Languages.Status.REVIEWED) info += Messages.get(this, "completed"); + else if (currLang.status() == Languages.Status._COMPLETE_) info += Messages.get(this, "completed"); else if (currLang.status() == Languages.Status.UNREVIEWED) info += Messages.get(this, "unreviewed"); - else if (currLang.status() == Languages.Status.INCOMPLETE) info += Messages.get(this, "unfinished"); + else if (currLang.status() == Languages.Status.UNFINISHED) info += Messages.get(this, "unfinished"); txtLangInfo.text(info); if (currLang.status() == Languages.Status.UNREVIEWED) txtLangInfo.setHightlighting(true, CharSprite.WARNING); - else if (currLang.status() == Languages.Status.INCOMPLETE) txtLangInfo.setHightlighting(true, CharSprite.NEGATIVE); + else if (currLang.status() == Languages.Status.UNFINISHED) txtLangInfo.setHightlighting(true, CharSprite.NEGATIVE); add(txtLangInfo); sep2 = new ColorBlock(1, 1, 0xFF000000); @@ -1110,7 +1110,7 @@ public class WndSettings extends WndTabbed { btn.textColor(TITLE_COLOR); } else { switch (langs.get(i).status()) { - case INCOMPLETE: + case UNFINISHED: btn.textColor(0x888888); break; case UNREVIEWED: