minimap icon error and shortened table keys

- fixed lua error (detected on classic wrath) when the mouse leaves Skada's minimap button. - shortened Auras and CC modules table keys. - update zhCN thanks to @justinqian42 close #97 (credits: @justinqian42) close #95
bkader · Jan 19, 2023 · 8f1ef7e · 8f1ef7e
1 parent 9d10b95
commit 8f1ef7e
Show file tree

Hide file tree

Showing 13 changed files with 189 additions and 192 deletions.
diff --git a/Skada/Core/Core.lua b/Skada/Core/Core.lua
@@ -1881,6 +1881,11 @@ function Skada:CanReset()
 	end
 
 	local sets = self.sets
+
+	if not sets then
+		return false
+	end
+
 	for i = 1, #sets do
 		local set = sets[i]
 		if set and not set.keep then
@@ -2115,7 +2120,7 @@ function dataobj:OnEnter()
 end
 
 function dataobj:OnLeave()
-	self.tooltip:Hide()
+	(self.tooltip or GameTooltip):Hide()
 end
 
 function dataobj:OnClick(button)

diff --git a/Skada/Core/Options.lua b/Skada/Core/Options.lua
@@ -51,6 +51,7 @@ Skada.windowdefaults = {
 		borderthickness = 2,
 		borderinsets = 0,
 		toolbar = 1,
+		toolbaropacity = 0.5,
 		spacing = 1
 	},
 	background = {

diff --git a/Skada/Locales/deDE.lua b/Skada/Locales/deDE.lua
@@ -708,7 +708,6 @@ L["opt_tweaks_smartwait_desc"] = "Wie lange Skada warten soll, bevor die Strecke
 L["Modes Icons"] = "Modussymbole"
 L["Show modes icons on bars and menus."] = "Modussymbole in Balken und Men\195\188s anzeigen."
 L["opt_tweaks_combatlogfix_desc"] = "Verhindert, dass das Kampfprotokoll zerbricht, ohne es vollst\195\164ndig zu zerst\195\182ren."
-L["Conservative Mode"] = "Konservativer Modus"
 L["Enable this if you want to ignore \124cffffbb00%s\124r."] = "Aktivieren Sie dies, wenn Sie \124cffffbb00%s\124r ignorieren m\195\182chten."
 L["Custom Colors"] = "Farben \195\164ndern"
 L["Arena Teams"] = "Arenateams"

diff --git a/Skada/Locales/enUS.lua b/Skada/Locales/enUS.lua
@@ -774,7 +774,6 @@ L["Modes Icons"] = true
 L["Show modes icons on bars and menus."] = true
 L["Combat Log"] = _G.COMBAT_LOG
 L["opt_tweaks_combatlogfix_desc"] = "Keeps the combat log from breaking without munging it completely."
-L["Conservative Mode"] = true
 L["Enable this if you want to ignore \124cffffbb00%s\124r."] = true
 L["Colors"] = _G.COLORS
 L["Custom Colors"] = true

diff --git a/Skada/Locales/esMX.lua b/Skada/Locales/esMX.lua
@@ -712,7 +712,6 @@ L["opt_tweaks_smartwait_desc"] = "¿Por cu\195\161nto tiempo debe esperar antes
 L["Modes Icons"] = "Iconos de modos"
 L["Show modes icons on bars and menus."] = "Muestra los iconos de los modos en las barras y los men\195\186s."
 L["opt_tweaks_combatlogfix_desc"] = "Evita que el registro de combate se rompa sin estropearlo por completo."
-L["Conservative Mode"] = "Modo conservador"
 L["Enable this if you want to ignore \124cffffbb00%s\124r."] = "Active esta opci\195\179n si quiere ignorar \124cffffbb00%s\124r."
 L["Custom Colors"] = "Colores personalizados"
 L["Arena Teams"] = "Equipos de arena"

diff --git a/Skada/Locales/frFR.lua b/Skada/Locales/frFR.lua
@@ -713,7 +713,6 @@ L["opt_tweaks_smartwait_desc"] = "Combien de temps Skada doit attendre avant d'a
 L["Modes Icons"] = "Ic\195\180nes des modes"
 L["Show modes icons on bars and menus."] = "Afficher les ic\195\180nes des modes sur les barres et les menus."
 L["opt_tweaks_combatlogfix_desc"] = "Emp\195\170che le journal de combat de bugger sans le ronger compl\195\168tement."
-L["Conservative Mode"] = "Mode conservateur"
 L["Enable this if you want to ignore \124cffffbb00%s\124r."] = "Si activ\195\169, \124cffffbb00%s\124r sera compl\195\168tement ignor\195\169(e)."
 L["Custom Colors"] = "Couleurs personnalisées"
 L["Arena Teams"] = "\195\137quipes d'ar\195\168ne"

diff --git a/Skada/Locales/koKR.lua b/Skada/Locales/koKR.lua
@@ -710,7 +710,6 @@ L["Reported by: %s"] = "%s의 보고"
 L["Modes Icons"] = "모드 아이콘"
 L["Show modes icons on bars and menus."] = "바와 메뉴에 모드 아이콘을 표시합니다."
 L["opt_tweaks_combatlogfix_desc"] = "전투 기록을 완전히 정리하지 않고 깨지지 않도록 합니다."
-L["Conservative Mode"] = "보수적 모드"
 L["Enable this if you want to ignore \124cffffbb00%s\124r."] = "\124cffffbb00%s\124r.를 무시하려면 이 옵션을 활성화하십시오."
 L["Custom Colors"] = "맞춤 색상"
 L["Arena Teams"] = "투기장 팀"

diff --git a/Skada/Locales/ruRU.lua b/Skada/Locales/ruRU.lua
@@ -711,7 +711,6 @@ L["opt_tweaks_smartwait_desc"] = "Как долго Skada должен ждат
 L["Modes Icons"] = "Значки режимов"
 L["Show modes icons on bars and menus."] = "Показывать значки режимов на барах и в меню."
 L["opt_tweaks_combatlogfix_desc"] = "Защищает журнал боя от поломки, не разрушая его полностью."
-L["Conservative Mode"] = "Консервативный режим"
 L["Enable this if you want to ignore \124cffffbb00%s\124r."] = "Включите эту опцию, если хотите игнорировать \124cffffbb00%s\124r."
 L["Custom Colors"] = "Нестандартные цвета"
 L["Arena Teams"] = "Команды арены"

diff --git a/Skada/Locales/zhCN.lua b/Skada/Locales/zhCN.lua
diff --git a/Skada/Locales/zhTW.lua b/Skada/Locales/zhTW.lua
@@ -1,7 +1,7 @@
 local L = LibStub("AceLocale-3.0"):NewLocale(..., "zhTW")
 if not L then return end
 
-L["A damage meter."] = "一個傷害統計。"
+L["A damage meter."] = "模組化的傷害統計。"
 L["Memory usage is high. You may want to reset Skada, and enable one of the automatic reset options."] = "記憶體使用過高，你或許想要重置Skada，並且啟用一個自動重設的選項。"
 L["Skada is out of date. You can download the newest version from \124cffffbb00%s\124r"] = "Skada 已過期. 你可以在 \124cffffbb00%s\124r 下載到最新的版本."
 L["Skada: Modes"] = "Skada:模組"
@@ -707,7 +707,6 @@ L["opt_tweaks_smartwait_desc"] = "Skada 在停止該段之前應等待多長時
 L["Modes Icons"] = "模式圖標"
 L["Show modes icons on bars and menus."] = "在欄和菜單上顯示模式圖標。"
 L["opt_tweaks_combatlogfix_desc"] = "從斷裂而沒有完全破壞它可以防止戰鬥記錄。"
-L["Conservative Mode"] = "保守的"
 L["Enable this if you want to ignore \124cffffbb00%s\124r."] = "如果您想忽略\124cffffbb00%s\124r，請啟用此功能。"
 L["Custom Colors"] = "定制色彩"
 L["Arena Teams"] = "競技場隊伍"