Swap Chinese & Korean locale around.

This commit is contained in:
Kurt
2014-12-16 19:12:16 -08:00
parent 3a251d6b47
commit e1c75a9c8a
2 changed files with 10 additions and 4 deletions

View File

@@ -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

View File

@@ -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;