From c8a5ba0889f06409f951f8228818ce2f2861971b Mon Sep 17 00:00:00 2001 From: iAmAsval Date: Tue, 13 Oct 2020 23:24:54 +0200 Subject: [PATCH] fixed languages index so users don't get their language change --- FModel/Enums.cs | 46 +++++++++---------- .../ViewModels/ComboBox/ComboBoxViewModel.cs | 36 +++++++-------- FModel/Windows/Launcher/FLauncher.xaml.cs | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/FModel/Enums.cs b/FModel/Enums.cs index 1c65c51a..7aba5152 100644 --- a/FModel/Enums.cs +++ b/FModel/Enums.cs @@ -41,29 +41,29 @@ public enum ELanguage : long { - English, - AustralianEnglish, - BritishEnglish, - French, - German, - Italian, - Spanish, - SpanishLatin, - SpanishMexico, - Arabic, - Japanese, - Korean, - Polish, - PortugueseBrazil, - PortuguesePortugal, - Russian, - Turkish, - Chinese, - TraditionalChinese, - Swedish, - Thai, - Indonesian, - VietnameseVietnam + English = 0, + AustralianEnglish = 15, + BritishEnglish = 16, + French = 1, + German = 2, + Italian = 3, + Spanish = 4, + SpanishLatin = 5, + SpanishMexico = 17, + Arabic = 6, + Japanese = 7, + Korean = 8, + Polish = 9, + PortugueseBrazil = 10, + PortuguesePortugal = 18, + Russian = 11, + Turkish = 12, + Chinese = 13, + TraditionalChinese = 14, + Swedish = 19, + Thai = 20, + Indonesian = 21, + VietnameseVietnam = 22 } public enum EJsonType: long diff --git a/FModel/ViewModels/ComboBox/ComboBoxViewModel.cs b/FModel/ViewModels/ComboBox/ComboBoxViewModel.cs index aadb116b..19f78868 100644 --- a/FModel/ViewModels/ComboBox/ComboBoxViewModel.cs +++ b/FModel/ViewModels/ComboBox/ComboBoxViewModel.cs @@ -52,24 +52,24 @@ namespace FModel.ViewModels.ComboBox public static ObservableCollection languageCbViewModel = new ObservableCollection { new ComboBoxViewModel { Id = 0, Content = Properties.Resources.English, Property = ELanguage.English }, - new ComboBoxViewModel { Id = 1, Content = Properties.Resources.AustralianEnglish, Property = ELanguage.AustralianEnglish }, - new ComboBoxViewModel { Id = 2, Content = Properties.Resources.BritishEnglish, Property = ELanguage.BritishEnglish }, - new ComboBoxViewModel { Id = 3, Content = Properties.Resources.French, Property = ELanguage.French }, - new ComboBoxViewModel { Id = 4, Content = Properties.Resources.German, Property = ELanguage.German }, - new ComboBoxViewModel { Id = 5, Content = Properties.Resources.Italian, Property = ELanguage.Italian }, - new ComboBoxViewModel { Id = 6, Content = Properties.Resources.Spanish, Property = ELanguage.Spanish }, - new ComboBoxViewModel { Id = 7, Content = Properties.Resources.SpanishLatin, Property = ELanguage.SpanishLatin }, - new ComboBoxViewModel { Id = 8, Content = Properties.Resources.SpanishMexico, Property = ELanguage.SpanishMexico }, - new ComboBoxViewModel { Id = 9, Content = Properties.Resources.Arabic, Property = ELanguage.Arabic }, - new ComboBoxViewModel { Id = 10, Content = Properties.Resources.Japanese, Property = ELanguage.Japanese }, - new ComboBoxViewModel { Id = 11, Content = Properties.Resources.Korean, Property = ELanguage.Korean }, - new ComboBoxViewModel { Id = 12, Content = Properties.Resources.Polish, Property = ELanguage.Polish }, - new ComboBoxViewModel { Id = 13, Content = Properties.Resources.PortugueseBrazil, Property = ELanguage.PortugueseBrazil }, - new ComboBoxViewModel { Id = 14, Content = Properties.Resources.PortuguesePortugal, Property = ELanguage.PortuguesePortugal }, - new ComboBoxViewModel { Id = 15, Content = Properties.Resources.Russian, Property = ELanguage.Russian }, - new ComboBoxViewModel { Id = 16, Content = Properties.Resources.Turkish, Property = ELanguage.Turkish }, - new ComboBoxViewModel { Id = 17, Content = Properties.Resources.Chinese, Property = ELanguage.Chinese }, - new ComboBoxViewModel { Id = 18, Content = Properties.Resources.TraditionalChinese, Property = ELanguage.TraditionalChinese }, + new ComboBoxViewModel { Id = 15, Content = Properties.Resources.AustralianEnglish, Property = ELanguage.AustralianEnglish }, + new ComboBoxViewModel { Id = 16, Content = Properties.Resources.BritishEnglish, Property = ELanguage.BritishEnglish }, + new ComboBoxViewModel { Id = 1, Content = Properties.Resources.French, Property = ELanguage.French }, + new ComboBoxViewModel { Id = 2, Content = Properties.Resources.German, Property = ELanguage.German }, + new ComboBoxViewModel { Id = 3, Content = Properties.Resources.Italian, Property = ELanguage.Italian }, + new ComboBoxViewModel { Id = 4, Content = Properties.Resources.Spanish, Property = ELanguage.Spanish }, + new ComboBoxViewModel { Id = 5, Content = Properties.Resources.SpanishLatin, Property = ELanguage.SpanishLatin }, + new ComboBoxViewModel { Id = 17, Content = Properties.Resources.SpanishMexico, Property = ELanguage.SpanishMexico }, + new ComboBoxViewModel { Id = 6, Content = Properties.Resources.Arabic, Property = ELanguage.Arabic }, + new ComboBoxViewModel { Id = 7, Content = Properties.Resources.Japanese, Property = ELanguage.Japanese }, + new ComboBoxViewModel { Id = 8, Content = Properties.Resources.Korean, Property = ELanguage.Korean }, + new ComboBoxViewModel { Id = 9, Content = Properties.Resources.Polish, Property = ELanguage.Polish }, + new ComboBoxViewModel { Id = 10, Content = Properties.Resources.PortugueseBrazil, Property = ELanguage.PortugueseBrazil }, + new ComboBoxViewModel { Id = 18, Content = Properties.Resources.PortuguesePortugal, Property = ELanguage.PortuguesePortugal }, + new ComboBoxViewModel { Id = 11, Content = Properties.Resources.Russian, Property = ELanguage.Russian }, + new ComboBoxViewModel { Id = 12, Content = Properties.Resources.Turkish, Property = ELanguage.Turkish }, + new ComboBoxViewModel { Id = 13, Content = Properties.Resources.Chinese, Property = ELanguage.Chinese }, + new ComboBoxViewModel { Id = 14, Content = Properties.Resources.TraditionalChinese, Property = ELanguage.TraditionalChinese }, new ComboBoxViewModel { Id = 19, Content = Properties.Resources.Swedish, Property = ELanguage.Swedish }, new ComboBoxViewModel { Id = 20, Content = Properties.Resources.Thai, Property = ELanguage.Thai }, new ComboBoxViewModel { Id = 21, Content = Properties.Resources.Indonesian, Property = ELanguage.Indonesian }, diff --git a/FModel/Windows/Launcher/FLauncher.xaml.cs b/FModel/Windows/Launcher/FLauncher.xaml.cs index 5993fe59..a4388926 100644 --- a/FModel/Windows/Launcher/FLauncher.xaml.cs +++ b/FModel/Windows/Launcher/FLauncher.xaml.cs @@ -144,7 +144,7 @@ namespace FModel.Windows.Launcher { if (e.Source is TextBox text) { - bool m = Regex.IsMatch(text.Text, @"^donotedit-youcanteditanyway-(?:\w+)\.manifest$"); + bool m = Regex.IsMatch(text.Text, @"^donotedit-youcanteditanyway-\w+\.manifest$"); BrowsePath.IsEnabled = !m; text.IsReadOnly = m; }