From 2ac2b66fedfdfaf02f4a4e2895564b7eb48cc62c Mon Sep 17 00:00:00 2001 From: Polite Kiwi Date: Mon, 23 Dec 2019 17:53:20 -0500 Subject: [PATCH] Added The Following... - Updated to version 2.3.5 - Fixed bug in Tooltip.lua - Where local name could still be indexed - VarsUI - Added translations for VarsUI - Corrected line width in frame - Now closes with ESC instead of system menu --- KiwiItemInfo.lua | 20 ++++++++-------- Locale/deDE/deDE.lua | 10 ++++++++ Locale/enUS/enUS.lua | 10 ++++++++ Locale/esES/esES.lua | 10 ++++++++ Locale/frFR/frFR.lua | 10 ++++++++ Locale/itIT/itIT.lua | 10 ++++++++ Locale/koKR/koKR.lua | 10 ++++++++ Locale/ptBR/ptBR.lua | 10 ++++++++ Locale/ruRU/ruRU.lua | 10 ++++++++ Locale/zhCN/zhCN.lua | 56 ++++++++++++++++++++++++++------------------ Locale/zhTW/zhTW.lua | 10 ++++++++ VarsUI.lua | 5 ++-- 12 files changed, 136 insertions(+), 35 deletions(-) diff --git a/KiwiItemInfo.lua b/KiwiItemInfo.lua index 3d0834e..6547433 100644 --- a/KiwiItemInfo.lua +++ b/KiwiItemInfo.lua @@ -118,7 +118,7 @@ local ADDON_LOADED = function(addon) local VarsUI = KiwiItemInfo.VarsUI VarsUI.Init() - VarsUI.AddComponent(3, "Flash Grey Items:", + VarsUI.AddComponent(3, L["VUI_FLASH_GREY_ITEMS"], function(self) self:SetChecked(KiwiItemInfo_Vars.vars["flash_grey_items"]) end, @@ -126,7 +126,7 @@ local ADDON_LOADED = function(addon) KiwiItemInfo_Vars.vars["flash_grey_items"] = self:GetChecked() end ) - VarsUI.AddComponent(2, "Flash Hotkey:", + VarsUI.AddComponent(2, L["VUI_FLASH_HOTKEY"], function(self) self:SetText(KiwiItemInfo_Vars.vars["flash_hotkey"]) end, @@ -136,7 +136,7 @@ local ADDON_LOADED = function(addon) end ) VarsUI.Blank() - VarsUI.AddComponent(3, "Item Compare On:", + VarsUI.AddComponent(3, L["VUI_ITEM_COMPARE"], function(self) self:SetChecked(KiwiItemInfo_Vars.vars["item_compare_on"]) end, @@ -144,7 +144,7 @@ local ADDON_LOADED = function(addon) KiwiItemInfo_Vars.vars["item_compare_on"] = self:GetChecked() end ) - VarsUI.AddComponent(3, "Verbose Item Compare:", + VarsUI.AddComponent(3, L["VUI_IC_VERBOSE"], function(self) self:SetChecked(KiwiItemInfo_Vars.vars["item_compare_extra"]) end, @@ -153,7 +153,7 @@ local ADDON_LOADED = function(addon) end ) VarsUI.Blank() - VarsUI.AddComponent(3, "Item Vendor Price:", + VarsUI.AddComponent(3, L["VUI_VENDOR_PRICE"], function(self) self:SetChecked(KiwiItemInfo_Vars.vars["tooltip_price_on"]) end, @@ -162,7 +162,7 @@ local ADDON_LOADED = function(addon) end ) VarsUI.Blank() - VarsUI.AddComponent(3, "Show iLvl:", + VarsUI.AddComponent(3, L["VUI_SHOW_ILVL"], function(self) self:SetChecked(KiwiItemInfo_Vars.vars["tooltip_ilvl_on"]) end, @@ -170,7 +170,7 @@ local ADDON_LOADED = function(addon) KiwiItemInfo_Vars.vars["tooltip_ilvl_on"] = self:GetChecked() end ) - VarsUI.AddComponent(3, "Show iLvl On Items:", + VarsUI.AddComponent(3, L["VUI_ITEM_ILVL"], function(self) self:SetChecked(not KiwiItemInfo_Vars.vars["ilvl_only_equips"]) end, @@ -178,7 +178,7 @@ local ADDON_LOADED = function(addon) KiwiItemInfo_Vars.vars["ilvl_only_equips"] = not self:GetChecked() end ) - VarsUI.AddComponent(3, "Default iLvl Coloration:", + VarsUI.AddComponent(3, L["VUI_DEFAULT_ILVL_COLOR"], function(self) self:SetChecked(KiwiItemInfo_Vars.vars["tooltip_ilvl_colors"]) end, @@ -186,7 +186,7 @@ local ADDON_LOADED = function(addon) KiwiItemInfo_Vars.vars["tooltip_ilvl_colors"] = self:GetChecked() end ) - VarsUI.AddComponent(2, "Custom iLvl Color:", + VarsUI.AddComponent(2, L["VUI_CUSTOM_ILVL_COLOR"], function(self) self:SetText(KiwiItemInfo_Vars.vars["tooltip_ilvl_nocolors_rgb"]) end, @@ -196,7 +196,7 @@ local ADDON_LOADED = function(addon) if(text:match("%d+%s%d+%s%d+") or text:match("%d+%.%d+%s%d+%.%d+%s%d+%.%d+")) then KiwiItemInfo_Vars.vars["tooltip_ilvl_nocolors_rgb"] = self:GetText() else - -- TODO: error message + printi(2, L["VUI_FORMAT_ERROR"]) end end ) diff --git a/Locale/deDE/deDE.lua b/Locale/deDE/deDE.lua index d150b0f..3651487 100644 --- a/Locale/deDE/deDE.lua +++ b/Locale/deDE/deDE.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["deDE"] = { ["KIWIII_SET"] = "setzen", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "suchen", + ["VUI_FLASH_GREY_ITEMS"] = "Blinken Grau Items:", + ["VUI_FLASH_HOTKEY"] = "Blinken Hotkey:", + ["VUI_ITEM_COMPARE"] = "Item Vergleichen Am:", + ["VUI_IC_VERBOSE"] = "Ausführlicher Itemvergleich:", + ["VUI_VENDOR_PRICE"] = "Item Händlerpreis:", + ["VUI_SHOW_ILVL"] = "Zeige iLvl:", + ["VUI_ITEM_ILVL"] = "Zeige iLvl auf Items:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Standardmäßige iLvl-Färbung:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Benutzerdefinierte iLvl-Färbung:", + ["VUI_FORMAT_ERROR"] = "Ungültiges Farbformat eingegeben.", } diff --git a/Locale/enUS/enUS.lua b/Locale/enUS/enUS.lua index 684b449..da16a32 100644 --- a/Locale/enUS/enUS.lua +++ b/Locale/enUS/enUS.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["enUS"] = { ["KIWIII_SET"] = "set", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "search", + ["VUI_FLASH_GREY_ITEMS"] = "Flash Grey Items:", + ["VUI_FLASH_HOTKEY"] = "Flash Hotkey:", + ["VUI_ITEM_COMPARE"] = "Item Compare On:", + ["VUI_IC_VERBOSE"] = "Verbose Item Compare:", + ["VUI_VENDOR_PRICE"] = "Item Vendor Price:", + ["VUI_SHOW_ILVL"] = "Show iLvl:", + ["VUI_ITEM_ILVL"] = "Show iLvl On Items:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Default iLvl Coloration:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Custom iLvl Color:", + ["VUI_FORMAT_ERROR"] = "Invalid color format entered.", } diff --git a/Locale/esES/esES.lua b/Locale/esES/esES.lua index 0a607e6..8492fbb 100644 --- a/Locale/esES/esES.lua +++ b/Locale/esES/esES.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["esES"] = { ["KIWIII_SET"] = "set", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "buscar", + ["VUI_FLASH_GREY_ITEMS"] = "Objectos grises de destello:", + ["VUI_FLASH_HOTKEY"] = "Hotkey destello:", + ["VUI_ITEM_COMPARE"] = "Objecto Comparar en:", + ["VUI_IC_VERBOSE"] = "Objecto detallado Comparar:", + ["VUI_VENDOR_PRICE"] = "Objecto Precio del Vendedor:", + ["VUI_SHOW_ILVL"] = "Mostrar iLvl:", + ["VUI_ITEM_ILVL"] = "Mostrar iLvl en otros:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Coloración iLvl predeterminada:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Coloración iLvl personalizado:", + ["VUI_FORMAT_ERROR"] = "Formato de color no válido ingresado.", } diff --git a/Locale/frFR/frFR.lua b/Locale/frFR/frFR.lua index df108b5..827fd06 100644 --- a/Locale/frFR/frFR.lua +++ b/Locale/frFR/frFR.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["frFR"] = { ["KIWIII_SET"] = "set", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "chercher", + ["VUI_FLASH_GREY_ITEMS"] = "Articles gris flash:", + ["VUI_FLASH_HOTKEY"] = "Raccourci flash:", + ["VUI_ITEM_COMPARE"] = "Article comparer sur:", + ["VUI_IC_VERBOSE"] = "Article détaillé Comparer:", + ["VUI_VENDOR_PRICE"] = "Prix du vendeur d'article:", + ["VUI_SHOW_ILVL"] = "Afficher iLvl:", + ["VUI_ITEM_ILVL"] = "Afficher iLvl sur les éléments:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Couleur iLvl par défaut:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Couleur iLvl personnalisée:", + ["VUI_FORMAT_ERROR"] = "Format de couleur non valide entré.", } diff --git a/Locale/itIT/itIT.lua b/Locale/itIT/itIT.lua index fcfe247..c0f92c3 100644 --- a/Locale/itIT/itIT.lua +++ b/Locale/itIT/itIT.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["itIT"] = { ["KIWIII_SET"] = "set", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "ricerca", + ["VUI_FLASH_GREY_ITEMS"] = "Articoli Flash grigio:", + ["VUI_FLASH_HOTKEY"] = "Tasto di scelta rapida Flash:", + ["VUI_ITEM_COMPARE"] = "Articolo confronta su:", + ["VUI_IC_VERBOSE"] = "Confronta articoli dettagliati:", + ["VUI_VENDOR_PRICE"] = "Prezzo fornitore articolo:", + ["VUI_SHOW_ILVL"] = "Mostra iLvl:", + ["VUI_ITEM_ILVL"] = "Mostra iLvl sugli articoli:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Colorazione iLvl predefinita:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Colore iLvl personalizzato:", + ["VUI_FORMAT_ERROR"] = "È stato inserito un formato colore non valido.", } diff --git a/Locale/koKR/koKR.lua b/Locale/koKR/koKR.lua index 6c7439a..b41a94b 100644 --- a/Locale/koKR/koKR.lua +++ b/Locale/koKR/koKR.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["koKR"] = { ["KIWIII_SET"] = "set", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "search", + ["VUI_FLASH_GREY_ITEMS"] = "Flash Grey Items:", + ["VUI_FLASH_HOTKEY"] = "Flash Hotkey:", + ["VUI_ITEM_COMPARE"] = "Item Compare On:", + ["VUI_IC_VERBOSE"] = "Verbose Item Compare:", + ["VUI_VENDOR_PRICE"] = "Item Vendor Price:", + ["VUI_SHOW_ILVL"] = "Show iLvl:", + ["VUI_ITEM_ILVL"] = "Show iLvl On Items:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Default iLvl Coloration:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Custom iLvl Color:", + ["VUI_FORMAT_ERROR"] = "Invalid color format entered.", } diff --git a/Locale/ptBR/ptBR.lua b/Locale/ptBR/ptBR.lua index f9e7c5d..1ca5213 100644 --- a/Locale/ptBR/ptBR.lua +++ b/Locale/ptBR/ptBR.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["ptBR"] = { ["KIWIII_SET"] = "pôr", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "procurar", + ["VUI_FLASH_GREY_ITEMS"] = "Itens em Flash Cinza:", + ["VUI_FLASH_HOTKEY"] = "Tecla de atalho do Flash:", + ["VUI_ITEM_COMPARE"] = "Item comparar em:", + ["VUI_IC_VERBOSE"] = "Comparar item detalhado:", + ["VUI_VENDOR_PRICE"] = "Item Fornecedor Preço:", + ["VUI_SHOW_ILVL"] = "Mostre o iLvl:", + ["VUI_ITEM_ILVL"] = "Mostrar iLvl nos itens:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Coloração padrão do iLvl:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Cor personalizada do iLvl:", + ["VUI_FORMAT_ERROR"] = "Formato de cor inválido inserido.", } diff --git a/Locale/ruRU/ruRU.lua b/Locale/ruRU/ruRU.lua index 0d0bccf..6d956cf 100644 --- a/Locale/ruRU/ruRU.lua +++ b/Locale/ruRU/ruRU.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["ruRU"] = { ["KIWIII_SET"] = "set", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "поиск", + ["VUI_FLASH_GREY_ITEMS"] = "Вспышка серого:", + ["VUI_FLASH_HOTKEY"] = "Кнопка вспышки:", + ["VUI_ITEM_COMPARE"] = "Пункт сравнения на:", + ["VUI_IC_VERBOSE"] = "Детальное подробное сравнение:", + ["VUI_VENDOR_PRICE"] = "Пункт Поставщик Цена:", + ["VUI_SHOW_ILVL"] = "Показать iLvl:", + ["VUI_ITEM_ILVL"] = "Показать iLvl на предметах:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Цвет по умолчанию iLvl:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Пользовательский цвет iLvl:", + ["VUI_FORMAT_ERROR"] = "Введен неверный формат цвета.", } diff --git a/Locale/zhCN/zhCN.lua b/Locale/zhCN/zhCN.lua index ea1d801..624439a 100644 --- a/Locale/zhCN/zhCN.lua +++ b/Locale/zhCN/zhCN.lua @@ -1,7 +1,7 @@ KiwiItemInfo.Locale["zhCN"] = { - ["TOOLTIP_UNIT"] = "单件出售:", - ["TOOLTIP_STACK"] = "全部出售:", + ["TOOLTIP_UNIT"] = "出售单价:", + ["TOOLTIP_STACK"] = "整组售价:", ["TOOLTIP_ILVL"] = "装等(iLvl) ", ["TOOLTIP_PRY_EQUIP"] = "装备：", ["TOOLTIP_PRY_USE"] = "使用：", @@ -54,22 +54,22 @@ KiwiItemInfo.Locale["zhCN"] = { ["TOOLTIP_CMP_SHADOW"] = "[+-]%d+%s[暗影抗性]+", ["TOOLTIP_PRY_SHADOW"] = "暗影抗性", ["TOOLTIP_IC_SHADOW"] = "暗影抗性", - ["TOOLTIP_IC_DAMAGE_DELTA"] = " 伤害 (delta: ", + ["TOOLTIP_IC_DAMAGE_DELTA"] = " 伤害 (差值: ", ["TOOLTIP_ITEM_COMPARE"] = "Kiwi提示装备后的属性变化:", ["TOOLTIP_ITEM_CONTRIB"] = "统计贡献：", - ["TOOLTIP_EX_AGI_M_AP"] = "敏捷 M. AP: ", - ["TOOLTIP_EX_AGI_R_AP"] = "敏捷 R. AP: ", - ["TOOLTIP_EX_AGI_CRIT"] = "敏捷 Crit: ", - ["TOOLTIP_EX_AGI_DODGE"] = "敏捷 Dodge: ", - ["TOOLTIP_EX_AGI_AR"] = "敏捷 Armor: ", - ["TOOLTIP_EX_AGI_M_CAT_AP"] = "敏捷 Catform AP: ", - ["TOOLTIP_EX_STM_HP"] = "耐力 Health: ", - ["TOOLTIP_EX_STR_M_AP"] = "力量 M. AP: ", - ["TOOLTIP_EX_STR_BLOCK"] = "力量 Block: ", - ["TOOLTIP_EX_INT_MANA"] = "智力 Mana: ", - ["TOOLTIP_EX_INT_CRIT"] = "智力 Crit: ", - ["TOOLTIP_EX_SPT_HP5"] = "精神 H/5: ", - ["TOOLTIP_EX_SPT_MP5"] = "精神 M/5: ", + ["TOOLTIP_EX_AGI_M_AP"] = "敏捷/ (近战)AP: ", + ["TOOLTIP_EX_AGI_R_AP"] = "敏捷/ (远程)AP: ", + ["TOOLTIP_EX_AGI_CRIT"] = "敏捷/ 爆击: ", + ["TOOLTIP_EX_AGI_DODGE"] = "敏捷/ 躲闪: ", + ["TOOLTIP_EX_AGI_AR"] = "敏捷/ 护甲: ", + ["TOOLTIP_EX_AGI_M_CAT_AP"] = "敏捷/ (猫形态)AP: ", + ["TOOLTIP_EX_STM_HP"] = "耐力/ 生命值: ", + ["TOOLTIP_EX_STR_M_AP"] = "力量/ (近战)AP: ", + ["TOOLTIP_EX_STR_BLOCK"] = "力量/ 格挡: ", + ["TOOLTIP_EX_INT_MANA"] = "智力/ 法力值: ", + ["TOOLTIP_EX_INT_CRIT"] = "智力/ 爆击: ", + ["TOOLTIP_EX_SPT_HP5"] = "精神/ 5秒回血量: ", + ["TOOLTIP_EX_SPT_MP5"] = "精神/ 5秒回蓝量: ", ["TOOLTIP_EX_RES_ARCANE"] = "奥术抗性: ", ["TOOLTIP_EX_RES_FIRE"] = "火焰抗性: ", ["TOOLTIP_EX_RES_FROST"] = "冰霜抗性: ", @@ -88,20 +88,30 @@ KiwiItemInfo.Locale["zhCN"] = { ["COMMAND_SET_ERROR_VALUE"] = "Kiwi 需要一个值来设置参数...", ["COMMAND_SET_ERROR_INDEX"] = "Kiwi 需要一个参数...", ["COMMAND_SEARCH_ARG_LEN"] = "Kiwi Item Info: 参数长度无效", - ["COMMAND_SEARCH_ONE_HANDED"] = "One-Handed ", - ["COMMAND_SEARCH_TWO_HANDED"] = "Two-Handed ", - ["COMMAND_SEARCH_1H"] = "One", - ["COMMAND_SEARCH_2H"] = "Two", + ["COMMAND_SEARCH_ONE_HANDED"] = "单手 ", + ["COMMAND_SEARCH_TWO_HANDED"] = "双手 ", + ["COMMAND_SEARCH_1H"] = "单", + ["COMMAND_SEARCH_2H"] = "双", ["COMMAND_SEARCH_DONE"] = "Kiwi 说 `这就是你要的物品`:", ["COMMAND_SEARCH_DONE1"] = "Kiwi 太酷了. Kiwi 要起飞了. kiwi 共找到物品 ", ["COMMAND_SEARCH_FAIL"] = "Kiwi 找不到任何相关物品! :(", - ["KIWIII_HELP"] = "救命", - ["KIWIII_RELOAD"] = "重装", - ["KIWIII_RESET"] = "重启", + ["KIWIII_HELP"] = "帮助", + ["KIWIII_RELOAD"] = "重载", + ["KIWIII_RESET"] = "重置", ["KIWIII_VARS"] = "变数", ["KIWIII_SET"] = "组", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "搜索", + ["VUI_FLASH_GREY_ITEMS"] = "出售灰色物品:", + ["VUI_FLASH_HOTKEY"] = "出售快捷键:", + ["VUI_ITEM_COMPARE"] = "开关装备对比:", + ["VUI_IC_VERBOSE"] = "显示更多对比项:", + ["VUI_VENDOR_PRICE"] = "显示物品售价:", + ["VUI_SHOW_ILVL"] = "装备显示装等:", + ["VUI_ITEM_ILVL"] = "全物品显示装等:", + ["VUI_DEFAULT_ILVL_COLOR"] = "装等显示着色:", + ["VUI_CUSTOM_ILVL_COLOR"] = "自定义装等颜色:", + ["VUI_FORMAT_ERROR"] = "输入了无效的颜色格式。", } diff --git a/Locale/zhTW/zhTW.lua b/Locale/zhTW/zhTW.lua index 2d53b50..5fac0a1 100644 --- a/Locale/zhTW/zhTW.lua +++ b/Locale/zhTW/zhTW.lua @@ -102,6 +102,16 @@ KiwiItemInfo.Locale["zhTW"] = { ["KIWIII_SET"] = "set", ["KIWIII_ACI"] = "aci", ["KIWIII_SEARCH"] = "search", + ["VUI_FLASH_GREY_ITEMS"] = "Flash Grey Items:", + ["VUI_FLASH_HOTKEY"] = "Flash Hotkey:", + ["VUI_ITEM_COMPARE"] = "Item Compare On:", + ["VUI_IC_VERBOSE"] = "Verbose Item Compare:", + ["VUI_VENDOR_PRICE"] = "Item Vendor Price:", + ["VUI_SHOW_ILVL"] = "Show iLvl:", + ["VUI_ITEM_ILVL"] = "Show iLvl On Items:", + ["VUI_DEFAULT_ILVL_COLOR"] = "Default iLvl Coloration:", + ["VUI_CUSTOM_ILVL_COLOR"] = "Custom iLvl Color:", + ["VUI_FORMAT_ERROR"] = "Invalid color format entered.", } diff --git a/VarsUI.lua b/VarsUI.lua index 8911303..55effc2 100644 --- a/VarsUI.lua +++ b/VarsUI.lua @@ -9,7 +9,7 @@ local elements local font -local label_width = 140 +local label_width = 190 local edit_width = 100 local padding_l = 10 @@ -19,7 +19,8 @@ local height = 0 VarsUI.Init = function() - background = CreateFrame("Frame", nil, UIParent, "BasicFrameTemplate") + table.insert(UISpecialFrames, "KiwiItemInfoKIWIIIFrame") + background = CreateFrame("Frame", "KiwiItemInfoKIWIIIFrame", UIParent, "BasicFrameTemplate") background.TitleText:SetText("Kiwi Item Info Vars") background:SetSize(300, 300) background:SetPoint("CENTER")