ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #198 from Aireil/fix_combo_selection

Browse source 
Fix the language combo preview in settings if no override
This commit is contained in:
goaaats 2020-11-22 00:55:49 +01:00 • committed by GitHub
commit eebf4b9b9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dalamud/Interface/DalamudSettingsWindow.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using CheapLoc; using CheapLoc;
@ -28,7 +29,22 @@ namespace Dalamud.Interface
this.doDalamudTest = this.dalamud.Configuration.DoDalamudTest; this.doDalamudTest = this.dalamud.Configuration.DoDalamudTest;
this.languages = Localization.ApplicableLangCodes.Prepend("en").ToArray(); this.languages = Localization.ApplicableLangCodes.Prepend("en").ToArray();
this.langIndex = string.IsNullOrEmpty(this.dalamud.Configuration.LanguageOverride) ? 0 : Array.IndexOf(this.languages, this.dalamud.Configuration.LanguageOverride); try {
if (string.IsNullOrEmpty(this.dalamud.Configuration.LanguageOverride)) {
var currentUiLang = CultureInfo.CurrentUICulture;
if (Localization.ApplicableLangCodes.Any(x => currentUiLang.TwoLetterISOLanguageName == x))
this.langIndex = Array.IndexOf(this.languages, currentUiLang.TwoLetterISOLanguageName);
else
this.langIndex = 0;
}
else {
this.langIndex = Array.IndexOf(this.languages, this.dalamud.Configuration.LanguageOverride);
}
}
catch (Exception) {
this.langIndex = 0;
}
} }
private string[] languages; private string[] languages;