From 2c1717a40927629a696617eb700e64fb73df9ae5 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 10 Dec 2018 20:48:21 -0800 Subject: [PATCH] Misc updates extract programlanguage to enum fix parse fail for settings' version; old syntax fails to parse delete unused file from recent pull --- PKHeX.Core/Game/GameStrings/GameInfo.cs | 43 +++++++++++++++++++++++++ PKHeX.WinForms/MainWindow/Main.cs | 20 +++--------- version.txt | 1 - 3 files changed, 48 insertions(+), 16 deletions(-) delete mode 100644 version.txt diff --git a/PKHeX.Core/Game/GameStrings/GameInfo.cs b/PKHeX.Core/Game/GameStrings/GameInfo.cs index 6de111459..b3bb2437e 100644 --- a/PKHeX.Core/Game/GameStrings/GameInfo.cs +++ b/PKHeX.Core/Game/GameStrings/GameInfo.cs @@ -201,4 +201,47 @@ public static IReadOnlyList GetLocationList(GameVersion version, int return Strings.GetLocationList(version, pkmFormat, egg); } } + + public enum ProgramLanguage + { + /// + /// Japanese + /// + 日本語, + + /// + /// English + /// + English, + + /// + /// French + /// + Français, + + /// + /// Italian + /// + Italiano, + + /// + /// German + /// + Deutsch, + + /// + /// Spanish + /// + Español, + + /// + /// Korean + /// + 한국어, + + /// + /// Chinese + /// + 中文, + } } diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index ff2f9a65c..bf4b6e0b0 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -80,17 +80,7 @@ private set public static bool HaX { get; private set; } public static bool IsInitialized { get; private set; } - private readonly string[] main_langlist = - { - "日本語", // JPN - "English", // ENG - "Français", // FRE - "Italiano", // ITA - "Deutsch", // GER - "Español", // SPA - "한국어", // KOR - "中文", // CHN - }; + private readonly string[] main_langlist = Enum.GetNames(typeof(ProgramLanguage)); private static readonly List Plugins = new List(); #endregion @@ -254,7 +244,7 @@ private void FormLoadCheckForUpdates() catch (Exception ex) { Debug.WriteLine($"Exception while checking for latest version: {ex}"); - } + } }); } @@ -273,13 +263,13 @@ private void FormLoadConfig(out bool BAKprompt, out bool showChangelog) int lang = GameInfo.Language(l); if (lang < 0) lang = GameInfo.Language(); - CB_MainLanguage.SelectedIndex = lang >= 0 ? lang : 1; // english + CB_MainLanguage.SelectedIndex = lang >= 0 ? lang : (int)ProgramLanguage.English; // Version Check if (Settings.Version.Length > 0) // already run on system { - Version.TryParse(Settings.Version, out Version lastrev); - showChangelog = lastrev < CurrentProgramVersion; + bool parsed = Version.TryParse(Settings.Version, out Version lastrev); + showChangelog = parsed && lastrev < CurrentProgramVersion; } // BAK Prompt diff --git a/version.txt b/version.txt deleted file mode 100644 index 006969eab..000000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -18.11.01 \ No newline at end of file