Repair non english clients

derfloh205 · Dec 18, 2023 · a2f202b · a2f202b
1 parent 9694085
commit a2f202b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 447 deletions.
diff --git a/CraftSim.toc b/CraftSim.toc
@@ -4,7 +4,7 @@
 ## Title: CraftSim
 ## Notes: Calculates the average profit based on your profession stats and other tools for dragonflight gold making
 ## Author: genju
-## Version: 12.0.3
+## Version: 12.0.5
 ## X-Curse-Project-ID: 705015
 ## X-Wago-ID: 0mNwaPKo
 ## X-WoWI-ID: 26519

diff --git a/Data/Classes/ProfessionStats.lua b/Data/Classes/ProfessionStats.lua
@@ -33,6 +33,7 @@ function CraftSim.ProfessionStats:SetStatsByOperationInfo(recipeData, operationI
 		print("No Operation Info -> No Stats")
 		return
 	end
+	print("Parse Stats By OperationInfo", false, true)
     self.skill.value = operationInfo.baseSkill + operationInfo.bonusSkill
     self.recipeDifficulty.value = operationInfo.baseDifficulty
 	local bonusStats = operationInfo.bonusStats
@@ -43,6 +44,7 @@ function CraftSim.ProfessionStats:SetStatsByOperationInfo(recipeData, operationI
 		local multicraft = string.lower(CraftSim.LOCAL:GetText(CraftSim.CONST.TEXT.STAT_MULTICRAFT))
 		local resourcefulness = string.lower(CraftSim.LOCAL:GetText(CraftSim.CONST.TEXT.STAT_RESOURCEFULNESS))
 		local craftingspeed = string.lower(CraftSim.LOCAL:GetText(CraftSim.CONST.TEXT.STAT_CRAFTINGSPEED))
+		print(CraftSim.LOCAL)
 		if statName == craftingspeed then
 			self.craftingspeed:SetValueByPercent(statInfo.ratingPct / 100)
 		elseif statName == inspiration then

diff --git a/Data/News.lua b/Data/News.lua
@@ -1,4 +1,4 @@
-local CraftSimAddonName, CraftSim = ...
+local _, CraftSim = ...
 
 CraftSim.NEWS = {}
 
@@ -9,9 +9,11 @@ function CraftSim.NEWS:GET_NEWS()
     local news = {
         f.bb("                   Hello and thank you for using CraftSim!\n"),
         f.bb("                                 ( You are awesome! )"),
-        newP("12.0.4"),
+        newP("12.0.5"),
         f.p .. "Hotfixes regarding " ..f.bb("CustomerHistory") .. " Data Migration",
         f.p .. "Added price source addons to optional deps......",
+        f.p .. "Fixed average profit not correctly calculated",
+        f.a .. "for non english clients",
         newP("12.0.0"),
         f.P .. "Reworked " .. f.bb("Customer History") .. ". Now includes:",
         f.a .. "- " .. f.g("A Whisper Button"),

diff --git a/Locals/Localization.lua b/Locals/Localization.lua
@@ -10,25 +10,25 @@ function CraftSim.LOCAL:Init()
     if currentLocale == CraftSim.CONST.LOCALES.EN then
         CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL.LOCAL_EN
     elseif currentLocale == CraftSim.CONST.LOCALES.DE then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_DE
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_DE:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.IT then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_IT
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_IT:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.RU then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_RU
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_RU:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.PT then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_PT
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_PT:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.ES then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_ES
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_ES:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.FR then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_FR
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_FR:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.MX then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_ES
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_ES:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.KO then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_KO
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_KO:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.TW then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_TW
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_TW:GetData()
     elseif currentLocale == CraftSim.CONST.LOCALES.CN then
-        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_CN
+        CraftSim.LOCAL.LOCAL_CLIENT = CraftSim.LOCAL_CN:GetData()
     else
         error("CraftSim Error: Client not supported: " .. tostring(currentLocale)) 
     end

diff --git a/Pricing/PriceData.lua b/Pricing/PriceData.lua
@@ -102,7 +102,7 @@ end
 ---@param idOrLink? number | string
 ---@return number? auctionAmount
 function CraftSim.PRICEDATA:GetAuctionAmount(idOrLink)
-    if IsAddOnLoaded(CraftSimTSM.name) then
+    if C_AddOns.IsAddOnLoaded(CraftSimTSM.name) then
         return CraftSimTSM:GetAuctionAmount(idOrLink)
     else
         return