From b75443b4b451ad7b9096b11d56e47267696f2bb3 Mon Sep 17 00:00:00 2001 From: Road-block Date: Sun, 29 Jul 2018 16:19:39 +0300 Subject: [PATCH] fix extra tooltip skinning when pfUI is present updated zhCN localization from qcat --- localization.lua | 64 ++++++++++++++++++++++++------------------------ shootyepgp.lua | 2 +- shootyepgp.toc | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/localization.lua b/localization.lua index 0e7bc41..053822d 100644 --- a/localization.lua +++ b/localization.lua @@ -306,9 +306,9 @@ L:RegisterTranslations("zhCN", function() return { ["|cff00ff00%02d|r|cffffffffsec|r"] = "|cff00ff00%02d|r|cffffffff秒|r", ["Manually modified %s\'s note. EPGP was %s"] = "手动修改 %s\'s 记录. EPGP 是 %s", ["|cffff0000Manually modified %s\'s note. EPGP was %s|r"] = "|cffff0000手动修改 %s\'s 记录. EPGP 是 %s|r", - ["Whisper %s a + for %s (mainspec)"] = "Whisper %s a + for %s (mainspec)", -- needs new translation - ["Whisper %s a - for %s (offspec)"] = "Whisper %s a - for %s (offspec)", -- needs new translation - ["Whisper %s a + or - for %s (mainspec or offspec)"] = "Whisper %s a + or - for %s (mainspec or offspec)", -- needs new translation + ["Whisper %s a + for %s (mainspec)"] = "私聊 %s + 为 %s (主天赋)", + ["Whisper %s a - for %s (offspec)"] = "私聊 %s - 为 %s (副天赋)", + ["Whisper %s a + or - for %s (mainspec or offspec)"] = "私聊 %s + 或 - 为 %s (主天赋或副天赋)", ["Click $MS or $OS for %s"] = "Click $MS 或 $OS for %s", ["or $OS "] = "或 $OS ", ["$MS or "] = "$MS 或 ", @@ -400,32 +400,32 @@ L:RegisterTranslations("zhCN", function() return { ["GP Actions"] = "GP 操作", ["Remind me Later"] = "以后提醒我", ["Need MasterLooter to perform Bid Calls!"] = "Need MasterLooter to perform Bid Calls!", - ["shootyepgp alts"] = "shootyepgp alts", - ["Enable Alts"] = "Enable Alts", - ["Main"] = "Main", - ["Alt"] = "Alt", - ["Allow Alts to use Main\'s EPGP."] = "Allow Alts to use Main\'s EPGP.", - ["Alts EP %"] = "Alts EP %", - ["Set the % EP Alts can earn."] = "Set the % EP Alts can earn.", - [", alts"] = ", alts", - ["New Alts"] = "New Alts", - [", alts ep %"] = ", alts ep %", - ["New Alts EP %"] = "New Alts EP %", - ["Manually modified %s\'s note. Previous main was %s"] = "Manually modified %s\'s note. Previous main was %s", - ["|cffff0000Manually modified %s\'s note. Previous main was %s|r"] = "|cffff0000Manually modified %s\'s note. Previous main was %s|r", - [", %s\'s Main."] = ", %s\'s Main.", - ["Your main has been set to %s"] = "Your main has been set to %s", - ["Alts"] = "Alts", - ["Logs cleared"] = "Logs cleared", - ["Restarted"] = "Restarted", - ["Progress"] = "Progress", - ["Print Progress Multiplier."] = "Print Progress Multiplier.", - ["Offspec"] = "Offspec", - ["Print Offspec Price."] = "Print Offspec Price.", - ["Progress Setting: %s"] = "Progress Setting: %s", - ["Offspec Price: %s%%"] = "Offspec Price: %s%%", - ["Minimum EP: %s"] = "Minimum EP: %s", - ["Minimum EP"] = "Minimum EP", - ["Set Minimum EP"] = "Set Minimum EP", - ["New Minimum EP"] = "New Minimum EP", -} end) \ No newline at end of file + ["shootyepgp alts"] = "shootyepgp 小号", + ["Enable Alts"] = "启用小号", + ["Main"] = "大号", + ["Alt"] = "小号", + ["Allow Alts to use Main\'s EPGP."] = "允许小号使用大号的 EPGP.", + ["Alts EP %"] = "小号 EP %", + ["Set the % EP Alts can earn."] = "设置 % EP 小号可以赚取.", + [", alts"] = ", 小号", + ["New Alts"] = "新小号", + [", alts ep %"] = ", 小号 ep %", + ["New Alts EP %"] = "新小号 EP %", + ["Manually modified %s\'s note. Previous main was %s"] = "手动调整 %s 的备注. 以前的大号是 %s", + ["|cffff0000Manually modified %s\'s note. Previous main was %s|r"] = "|cffff0000手动调整 %s 的备注. 以前的大号是 %s|r", + [", %s\'s Main."] = ", %s 的大号.", + ["Your main has been set to %s"] = "你的大号设置为 %s", + ["Alts"] = "小号", + ["Logs cleared"] = "清除日志", + ["Restarted"] = "重新启动", + ["Progress"] = "进度", + ["Print Progress Multiplier."] = "打印进度调整器.", + ["Offspec"] = "副天赋", + ["Print Offspec Price."] = "打印副天赋价格.", + ["Progress Setting: %s"] = "进度设置: %s", + ["Offspec Price: %s%%"] = "副天赋价格: %s%%", + ["Minimum EP: %s"] = "最小值 EP: %s", + ["Minimum EP"] = "最小值 EP", + ["Set Minimum EP"] = "设置最小值 EP", + ["New Minimum EP"] = "新最小值 EP", +} end) diff --git a/shootyepgp.lua b/shootyepgp.lua index 73f7d2b..a44c7c7 100644 --- a/shootyepgp.lua +++ b/shootyepgp.lua @@ -536,7 +536,7 @@ function sepgp:AceEvent_FullyInitialized() -- SYNTHETIC EVENT, later than PLAYER -- if pfUI loaded, skin the extra tooltip if (pfUI) and pfUI.api and pfUI.api.CreateBackdrop and pfUI_config and pfUI_config.tooltip and pfUI_config.tooltip.alpha then - pfUI.api.CreateBackdrop(sepgp.extratip,nil,nil,pfUI_config.tooltip.alpha) + pfUI.api.CreateBackdrop(sepgp.extratip,nil,nil,tonumber(pfUI_config.tooltip.alpha)) end -- hook GiveMasterLoot to catch loot assign to members too far for chat parsing self:SecureHook("GiveMasterLoot") diff --git a/shootyepgp.toc b/shootyepgp.toc index 6de6f8d..a7c23e3 100644 --- a/shootyepgp.toc +++ b/shootyepgp.toc @@ -7,7 +7,7 @@ ## X-Website: https://github.com/Road-block/shootyepgp/releases/latest ## X-Category: Guild ## X-Credits: shooty, Qcat(zhCN) -## Version: 3.50.4 +## Version: 3.50.5 ## X-Alpha: ## OptionalDeps: Ace2 ## SavedVariables: sepgp_saychannel, sepgp_groupbyclass, sepgp_groupbyarmor, sepgp_groupbyrole, sepgp_raidonly, sepgp_dbver, sepgp_debug