From 09e651b3abea0d0a7857fcab2dfc807b9e7c1983 Mon Sep 17 00:00:00 2001
From: kalilistic <35899782+kalilistic@users.noreply.github.com>
Date: Sun, 4 Apr 2021 08:21:01 -0400
Subject: [PATCH] refactor: change client language to internal

---
 Dalamud/Data/DataManager.cs | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs
index 6ea358135..c8dced858 100644
--- a/Dalamud/Data/DataManager.cs
+++ b/Dalamud/Data/DataManager.cs
@@ -19,6 +19,11 @@ namespace Dalamud.Data
     /// </summary>
     public class DataManager : IDisposable
     {
+        /// <summary>
+        /// The current game client language.
+        /// </summary>
+        internal ClientLanguage Language;
+
         private const string IconFileFormat = "ui/icon/{0:D3}000/{1}{2:D6}.tex";
 
         /// <summary>
@@ -26,8 +31,6 @@ namespace Dalamud.Data
         /// </summary>
         private Lumina.GameData gameData;
 
-        private ClientLanguage language;
-
         private Thread luminaResourceThread;
 
         /// <summary>
@@ -39,7 +42,7 @@ namespace Dalamud.Data
             // Set up default values so plugins do not null-reference when data is being loaded.
             this.ServerOpCodes = new ReadOnlyDictionary<string, ushort>(new Dictionary<string, ushort>());
 
-            this.language = language;
+            this.Language = language;
         }
 
         /// <summary>
@@ -94,14 +97,14 @@ namespace Dalamud.Data
                     PanicOnSheetChecksumMismatch = false,
 #endif
 
-                    DefaultExcelLanguage = this.language switch {
-                        ClientLanguage.Japanese => Language.Japanese,
-                        ClientLanguage.English => Language.English,
-                        ClientLanguage.German => Language.German,
-                        ClientLanguage.French => Language.French,
+                    DefaultExcelLanguage = this.Language switch {
+                        ClientLanguage.Japanese => Lumina.Data.Language.Japanese,
+                        ClientLanguage.English => Lumina.Data.Language.English,
+                        ClientLanguage.German => Lumina.Data.Language.German,
+                        ClientLanguage.French => Lumina.Data.Language.French,
                         _ => throw new ArgumentOutOfRangeException(
-                                 nameof(this.language),
-                                 "Unknown Language: " + this.language),
+                                 nameof(this.Language),
+                                 "Unknown Language: " + this.Language),
                     },
                 };
 
@@ -156,11 +159,11 @@ namespace Dalamud.Data
         public ExcelSheet<T> GetExcelSheet<T>(ClientLanguage language) where T : ExcelRow
         {
             var lang = language switch {
-                ClientLanguage.Japanese => Language.Japanese,
-                ClientLanguage.English => Language.English,
-                ClientLanguage.German => Language.German,
-                ClientLanguage.French => Language.French,
-                _ => throw new ArgumentOutOfRangeException(nameof(this.language), "Unknown Language: " + this.language)
+                ClientLanguage.Japanese => Lumina.Data.Language.Japanese,
+                ClientLanguage.English => Lumina.Data.Language.English,
+                ClientLanguage.German => Lumina.Data.Language.German,
+                ClientLanguage.French => Lumina.Data.Language.French,
+                _ => throw new ArgumentOutOfRangeException(nameof(this.Language), "Unknown Language: " + this.Language)
             };
             return this.Excel.GetSheet<T>(lang);
         }
@@ -207,7 +210,7 @@ namespace Dalamud.Data
         /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
         public TexFile GetIcon(int iconId)
         {
-            return this.GetIcon(this.language, iconId);
+            return this.GetIcon(this.Language, iconId);
         }
 
         /// <summary>
@@ -223,7 +226,7 @@ namespace Dalamud.Data
                 ClientLanguage.English => "en/",
                 ClientLanguage.German => "de/",
                 ClientLanguage.French => "fr/",
-                _ => throw new ArgumentOutOfRangeException(nameof(this.language), "Unknown Language: " + this.language)
+                _ => throw new ArgumentOutOfRangeException(nameof(this.Language), "Unknown Language: " + this.Language)
             };
 
             return this.GetIcon(type, iconId);