From e1c75a9c8af91c8bed7e981ad50edb788fc550c5 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 16 Dec 2014 19:12:16 -0800 Subject: [PATCH] Swap Chinese & Korean locale around. --- Misc/PKX.cs | 2 +- PKX/f1-Main.cs | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Misc/PKX.cs b/Misc/PKX.cs index 40dc5c575..8b67df64a 100644 --- a/Misc/PKX.cs +++ b/Misc/PKX.cs @@ -269,7 +269,7 @@ public static int getGender(string s) public static string[] getCountryRegionText(int country, int region, string lang) { // Get Language we're fetching for - int index = Array.IndexOf(new string[] { "ja", "en", "fr", "de", "it", "es", "ko", "zh", }, lang); + int index = Array.IndexOf(new string[] { "ja", "en", "fr", "de", "it", "es", "zh", "ko", }, lang); // Return value storage string[] data = new string[2]; // country, region diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index ffc2b8269..83e2d2265 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -1494,7 +1494,11 @@ public void setCountrySubRegion(object sender, string type) { ComboBox CB = sender as ComboBox; int index = Util.getIndex(CB); - CB.DataSource = Util.getCBList(type, curlanguage); + // fix for Korean / Chinese being swapped + string cl = curlanguage + ""; + cl = (cl == "zh") ? "ko" : (cl == "ko") ? "zh" : cl; + + CB.DataSource = Util.getCBList(type, cl); CB.DisplayMember = "Text"; CB.ValueMember = "Value"; @@ -4128,12 +4132,14 @@ private void B_OUTPasserby_Click(object sender, EventArgs e) else if (game == 27) gamename = "OR"; else gamename = "UNK GAME"; + + string[] cr = PKX.getCountryRegionText(country, region, curlanguage); result += "OT: " + otname + Environment.NewLine + "Message: " + message + Environment.NewLine + "Game: " + gamename + Environment.NewLine + - "Country ID: " + country + Environment.NewLine + - "Region ID: " + region + Environment.NewLine + + "Country ID: " + cr[0] + Environment.NewLine + + "Region ID: " + cr[1] + Environment.NewLine + "Favorite: " + specieslist[favpkm] + Environment.NewLine; result += Environment.NewLine;