From 82fdf01c1d357501d00f80f4ebbfb57db61bf707 Mon Sep 17 00:00:00 2001 From: Darth Predator Date: Sun, 9 Apr 2017 12:32:00 +0300 Subject: [PATCH] Now it actually works for ru as well --- .../Armory/CharacterArmory/CharacterArmory.lua | 26 ++++++++--------- ElvUI_SLE/modules/bags/artifactpower.lua | 30 +++++++++----------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua index d5dc267..ef05640 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua @@ -1,4 +1,4 @@ -if select(2, GetAddOnInfo('ElvUI_KnightFrame')) and IsAddOnLoaded('ElvUI_KnightFrame') then return end +if select(2, GetAddOnInfo('ElvUI_KnightFrame')) and IsAddOnLoaded('ElvUI_KnightFrame') then return end local _G = _G local SLE, T, E, L, V, P, G = unpack(select(2, ...)) @@ -1141,18 +1141,18 @@ do --<< Artifact Monitor >> local EnchantError, EnchantError_MainHand, EnchantError_SecondaryHand local apItemCache = {} local apStringValueMillion = { - ["enUS"] = "(%d*%.?%d+) million", - ["enGB"] = "(%d*%.?%d+) million", - ["ptBR"] = "(%d*%.?%d+) [[milhao][milhoes]]?", - ["esMX"] = "(%d*%.?%d+) [[millon][millones]]?", - ["deDE"] = "(%d*%.?%d+) [[Million][Millionen]]?", - ["esES"] = "(%d*%.?%d+) [[millon][millones]]?", - ["frFR"] = "(%d*%.?%d+) [[million][millions]]?", - ["itIT"] = "(%d*%.?%d+) [[milione][milioni]]?", - ["ruRU"] = "(%d*%.?%d+) ", - ["koKR"] = "(%d*%.?%d+)?", - ["zhTW"] = "(%d*%.?%d+)?", - ["zhCN"] = "(%d*%.?%d+)?", + ["enUS"] = "(%d*[%p%s]?%d+) million", + ["enGB"] = "(%d*[%p%s]?%d+) million", + ["ptBR"] = "(%d*[%p%s]?%d+) [[milhão][milhões]]?", + ["esMX"] = "(%d*[%p%s]?%d+) [[millón][millones]]?", + ["deDE"] = "(%d*[%p%s]?%d+) [[Million][Millionen]]?", + ["esES"] = "(%d*[%p%s]?%d+) [[millón][millones]]?", + ["frFR"] = "(%d*[%p%s]?%d+) [[million][millions]]?", + ["itIT"] = "(%d*[%p%s]?%d+) [[milione][milioni]]?", + ["ruRU"] = "(%d*[%p%s]?%d+) млн", + ["koKR"] = "(%d*[%p%s]?%d+)만", + ["zhTW"] = "(%d*[%p%s]?%d+)萬", + ["zhCN"] = "(%d*[%p%s]?%d+)万", } local apStringValueMillionLocal = apStringValueMillion[GetLocale()] local empoweringSpellName = GetSpellInfo(227907) diff --git a/ElvUI_SLE/modules/bags/artifactpower.lua b/ElvUI_SLE/modules/bags/artifactpower.lua index bfcea7d..f8fb2ca 100644 --- a/ElvUI_SLE/modules/bags/artifactpower.lua +++ b/ElvUI_SLE/modules/bags/artifactpower.lua @@ -1,4 +1,4 @@ -local SLE, T, E, L, V, P, G = unpack(select(2, ...)) +local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local AP = SLE:NewModule("ArtifactPowerBags", 'AceHook-3.0', 'AceEvent-3.0') local B = E:GetModule('Bags') local _G = _G @@ -13,18 +13,18 @@ local pcall = pcall -- local apLineIndex local apItemCache = {} local apStringValueMillion = { - ["enUS"] = "(%d*%.?%d+) million", - ["enGB"] = "(%d*%.?%d+) million", - ["ptBR"] = "(%d*%.?%d+) [[milhao][milhoes]]?", - ["esMX"] = "(%d*%.?%d+) [[millon][millones]]?", - ["deDE"] = "(%d*%.?%d+) [[Million][Millionen]]?", - ["esES"] = "(%d*%.?%d+) [[millon][millones]]?", - ["frFR"] = "(%d*%.?%d+) [[million][millions]]?", - ["itIT"] = "(%d*%.?%d+) [[milione][milioni]]?", - ["ruRU"] = "(%d*%.?%d+) ", - ["koKR"] = "(%d*%.?%d+)?", - ["zhTW"] = "(%d*%.?%d+)?", - ["zhCN"] = "(%d*%.?%d+)?", + ["enUS"] = "(%d*[%p%s]?%d+) million", + ["enGB"] = "(%d*[%p%s]?%d+) million", + ["ptBR"] = "(%d*[%p%s]?%d+) [[milhao][milhoes]]?", + ["esMX"] = "(%d*[%p%s]?%d+) [[millon][millones]]?", + ["deDE"] = "(%d*[%p%s]?%d+) [[Million][Millionen]]?", + ["esES"] = "(%d*[%p%s]?%d+) [[millon][millones]]?", + ["frFR"] = "(%d*[%p%s]?%d+) [[million][millions]]?", + ["itIT"] = "(%d*[%p%s]?%d+) [[milione][milioni]]?", + ["ruRU"] = "(%d*[%p%s]?%d+) млн", + ["koKR"] = "(%d*[%p%s]?%d+)?", + ["zhTW"] = "(%d*[%p%s]?%d+)?", + ["zhCN"] = "(%d*[%p%s]?%d+)?", } local apStringValueMillionLocal = apStringValueMillion[GetLocale()] local function GetItemLinkArtifactPower(slotLink) @@ -46,7 +46,6 @@ local function GetItemLinkArtifactPower(slotLink) local value = T.match(tooltipText, apStringValueMillionLocal) if value then - -- digit1, digit2 = T.match(tooltipText, apStringValueMillionLocal) digit1, digit2 = T.match(value, "(%d+)[%p%s](%d+)") if digit1 and digit2 then ap = T.tonumber(T.format("%s.%s", digit1, digit2)) * 1e6 --Multiply by one million @@ -54,7 +53,6 @@ local function GetItemLinkArtifactPower(slotLink) ap = T.tonumber(value) * 1e6 --Multiply by one million end else - -- digit1, digit2, digit3 = T.match(tooltipText,"(%d+)[%p%s]?(%d+)[%p%s]?(%d+)") digit1, digit2, digit3 = T.match(tooltipText,"(%d+)[%p%s]?(%d+)[%p%s]?(%d+)") ap = T.tonumber(T.format("%s%s%s", digit1 or "", digit2 or "", (digit2 and digit3) and digit3 or "")) end @@ -75,10 +73,10 @@ local function GetItemLinkArtifactPower(slotLink) apItemCache[slotLink] = false --Cache item as not granting AP end - -- if E.db.sle.bags.artifactPower.short and apValue then apValue = E:ShortValue(apValue) end return apValue end + local function SlotUpdate(self, bagID, slotID) if (not bagID or not slotID) or bagID == -3 then return end if not self.Bags[bagID] or not self.Bags[bagID][slotID] then -- 1.7.9.5