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

Remove Lumina Language extension, use ClientLanguage instead

Browse source
This commit is contained in:
Florian Maunier 2020-04-09 10:50:15 +02:00
parent 3bfc831167
commit 227400d821
No known key found for this signature in database
GPG key ID: 3919060DDEE2A555
2 changed files with 11 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Dalamud/Data/DataManager.cs
View file

@ -142,7 +142,7 @@ namespace Dalamud.Data
/// <returns>The <see cref="TexFile"/> containing the icon.</returns> /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
public TexFile GetIcon(int iconId) public TexFile GetIcon(int iconId)
{ {
return GetIcon(string.Empty, iconId); return GetIcon(this.language, iconId);
} }
/// <summary> /// <summary>
@ -151,11 +151,17 @@ namespace Dalamud.Data
/// <param name="iconLanguage">The requested language.</param> /// <param name="iconLanguage">The requested language.</param>
/// <param name="iconId">The icon ID.</param> /// <param name="iconId">The icon ID.</param>
/// <returns>The <see cref="TexFile"/> containing the icon.</returns> /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
public TexFile GetIcon(Language iconLanguage, int iconId) public TexFile GetIcon(ClientLanguage iconLanguage, int iconId)
{ {
var type = iconLanguage.GetCode(); var type = iconLanguage switch {
if (type.Length > 0) ClientLanguage.Japanese => "ja/",
type += "/"; ClientLanguage.English => "en/",
ClientLanguage.German => "de/",
ClientLanguage.French => "fr/",
_ => throw new ArgumentOutOfRangeException(nameof(this.language),
"Unknown Language: " + this.language)
};
return GetIcon(type, iconId); return GetIcon(type, iconId);
} }

33
Dalamud/Data/LuminaExtensions/LanguageExtensions.cs
View file

@ -1,33 +0,0 @@
using System.Collections.Generic;
using Lumina.Data;
namespace Dalamud.Data.LuminaExtensions
{
/// <summary>
/// Extensions to <see cref="Language"/>.
/// </summary>
public static class LanguageExtensions
{
private static readonly Dictionary<Language, string> LangToCode = new Dictionary<Language, string>()
{
{ Language.None, "" },
{ Language.Japanese, "ja" },
{ Language.English, "en" },
{ Language.German, "de" },
{ Language.French, "fr" },
{ Language.ChineseSimplified, "chs" },
{ Language.ChineseTraditional, "cht" },
{ Language.Korean, "ko" },
};
/// <summary>
/// Return the language code for a <see cref="Language"/>.
/// </summary>
/// <param name="language">The Language.</param>
/// <returns>The language code.</returns>
public static string GetCode(this Language language)
{
return LangToCode[language];
}
}
}