diff --git a/ElvUI_SLE/dev/staticpopups.lua b/ElvUI_SLE/dev/staticpopups.lua index 9c8f5b8..9fea07f 100755 --- a/ElvUI_SLE/dev/staticpopups.lua +++ b/ElvUI_SLE/dev/staticpopups.lua @@ -24,7 +24,7 @@ E.PopupDialogs['ENHANCED_SLE_INCOMPATIBLE'] = { } E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'] = { - text = L["SLE_INCOMPATIBLE_ADDON"], + text = gsub(L["INCOMPATIBLE_ADDON"], "ElvUI", "Shadow & Light"), OnAccept = function(self) DisableAddOn(E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].addon); ReloadUI(); end, OnCancel = function(self) E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].optiontable[E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].value] = false; ReloadUI(); end, timeout = 0, diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index 512bc06..8190a09 100755 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -26,7 +26,6 @@ L["Reset All"] = true L["Reset all Shadow & Light options and movers to their defaults"] = true L["Reset these options to defaults"] = true L['Oh lord, you have got ElvUI Enhanced and Shadow & Light both enabled at the same time. Select an addon to disable.'] = true -L["SLE_INCOMPATIBLE_ADDON"] = "The addon %s is not compatible with Shadow & Light's %s module. Please select either the addon or the Shadow & Light module to disable." --Install-- L["Shadow & Light Settings"] = true diff --git a/ElvUI_SLE/modules/datatexts/currency.lua b/ElvUI_SLE/modules/datatexts/currency.lua index 59b3057..ed54c52 100644 --- a/ElvUI_SLE/modules/datatexts/currency.lua +++ b/ElvUI_SLE/modules/datatexts/currency.lua @@ -287,4 +287,4 @@ local function OnEnter(self) DT.tooltip:Show() end -DT:RegisterDatatext('S&L Currency', {'PLAYER_ENTERING_WORLD', 'PLAYER_MONEY', 'SEND_MAIL_MONEY_CHANGED', 'SEND_MAIL_COD_CHANGED', 'PLAYER_TRADE_MONEY', 'TRADE_MONEY_CHANGED', 'SPELLS_CHANGED'}, OnEvent, nil, Click, OnEnter) \ No newline at end of file +DT:RegisterDatatext('S&L '..CURRENCY, {'PLAYER_ENTERING_WORLD', 'PLAYER_MONEY', 'SEND_MAIL_MONEY_CHANGED', 'SEND_MAIL_COD_CHANGED', 'PLAYER_TRADE_MONEY', 'TRADE_MONEY_CHANGED', 'SPELLS_CHANGED'}, OnEvent, nil, Click, OnEnter) \ No newline at end of file diff --git a/ElvUI_SLE/modules/datatexts/mail.lua b/ElvUI_SLE/modules/datatexts/mail.lua index 8d441f9..5af8d6e 100644 --- a/ElvUI_SLE/modules/datatexts/mail.lua +++ b/ElvUI_SLE/modules/datatexts/mail.lua @@ -95,5 +95,5 @@ end onLeaveFunc - function to fire OnLeave, if not provided one will be set for you that hides the tooltip. ]] -DT:RegisterDatatext('S&L Mail', {'PLAYER_ENTERING_WORLD', 'MAIL_INBOX_UPDATE', 'UPDATE_PENDING_MAIL', 'MAIL_CLOSED', 'PLAYER_LOGIN','MAIL_SHOW'}, OnEvent, nil, nil, OnEnter) +DT:RegisterDatatext('S&L '..MAIL_LABEL, {'PLAYER_ENTERING_WORLD', 'MAIL_INBOX_UPDATE', 'UPDATE_PENDING_MAIL', 'MAIL_CLOSED', 'PLAYER_LOGIN','MAIL_SHOW'}, OnEvent, nil, nil, OnEnter) diff --git a/ElvUI_SLE/modules/datatexts/played.lua b/ElvUI_SLE/modules/datatexts/played.lua index 6d78259..bb89337 100644 --- a/ElvUI_SLE/modules/datatexts/played.lua +++ b/ElvUI_SLE/modules/datatexts/played.lua @@ -20,7 +20,7 @@ local OnEnter = function(self) --local Panel, Anchor, xOff, yOff = self:GetTooltipAnchor() --DT.tooltip:SetOwner(Panel, Anchor, xOff, yOff) DT.tooltip:ClearLines() - DT.tooltip:AddLine(L["Time Played"], 1, 1, 1) + DT.tooltip:AddLine(TIME_PLAYED_MSG, 1, 1, 1) DT.tooltip:AddLine(' ') DT.tooltip:AddDoubleLine(L["Session:"], SessionDay > 0 and format(PlayedTimeFormatFull, SessionDay, SessionHour, SessionMinute, SessionSecond) or format(PlayedTimeFormatNoDay, SessionHour, SessionMinute, SessionSecond), 1, 1, 1, 1, 1, 1) if LastLevelSecond > 0 then @@ -60,7 +60,7 @@ local OnUpdate = function(self, elapsed) if (not self.text) then local text = self:CreateFontString(nil, 'OVERLAY') text:SetFont(DataText.Font, DataText.Size, DataText.Flags) - text:SetText('Time Played') + text:SetText(TIME_PLAYED_MSG) self.text = text end @@ -164,4 +164,4 @@ local Disable = function(self) self:SetScript('OnEnter', nil) self:SetScript('OnLeave', nil) end]] -DT:RegisterDatatext('Time Played', {'TIME_PLAYED_MSG', 'PLAYER_LEVEL_UP', 'PLAYER_ENTERING_WORLD' , 'PLAYER_LOGOUT'}, OnEvent, OnUpdate, OnMouseDown, OnEnter, OnLeave) \ No newline at end of file +DT:RegisterDatatext('S&L '..TIME_PLAYED_MSG, {'TIME_PLAYED_MSG', 'PLAYER_LEVEL_UP', 'PLAYER_ENTERING_WORLD' , 'PLAYER_LOGOUT'}, OnEvent, OnUpdate, OnMouseDown, OnEnter, OnLeave) \ No newline at end of file diff --git a/ElvUI_SLE/modules/datatexts/spirit.lua b/ElvUI_SLE/modules/datatexts/spirit.lua index ed67131..58b4b93 100755 --- a/ElvUI_SLE/modules/datatexts/spirit.lua +++ b/ElvUI_SLE/modules/datatexts/spirit.lua @@ -6,8 +6,8 @@ local lastPanel; local join = string.join local function OnEvent(self, event, unit) - local _,spirit = UnitStat("player",5) - self.text:SetFormattedText(displayNumberString, "Spirit", spirit) + local _, spirit = UnitStat("player", 5) + self.text:SetFormattedText(displayNumberString, SPELL_STAT5_NAME, spirit) lastPanel = self end @@ -21,15 +21,4 @@ local function ValueColorUpdate(hex, r, g, b) end E['valueColorUpdateFuncs'][ValueColorUpdate] = true ---[[ - DT:RegisterDatatext(name, events, eventFunc, updateFunc, clickFunc, onEnterFunc, onLeaveFunc) - - name - name of the datatext (required) - events - must be a table with string values of event names to register - eventFunc - function that gets fired when an event gets triggered - updateFunc - onUpdate script target function - click - function to fire when clicking the datatext - onEnterFunc - function to fire OnEnter - onLeaveFunc - function to fire OnLeave, if not provided one will be set for you that hides the tooltip. -]] -DT:RegisterDatatext('Spirit', {"UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent) \ No newline at end of file +DT:RegisterDatatext(SPELL_STAT5_NAME, {"UNIT_STATS", "UNIT_AURA", "FORGE_MASTER_ITEM_CHANGED", "ACTIVE_TALENT_GROUP_CHANGED", "PLAYER_TALENT_UPDATE"}, OnEvent) \ No newline at end of file diff --git a/ElvUI_SLE/modules/datatexts/time.lua b/ElvUI_SLE/modules/datatexts/time.lua index 2730a5d..558380f 100755 --- a/ElvUI_SLE/modules/datatexts/time.lua +++ b/ElvUI_SLE/modules/datatexts/time.lua @@ -210,15 +210,5 @@ function Update(self, t) lastPanel = self int = 5 end ---[[ - DT:RegisterDatatext(name, events, eventFunc, updateFunc, clickFunc, onEnterFunc, onLeaveFunc) - - name - name of the datatext (required) - events - must be a table with string values of event names to register - eventFunc - function that gets fired when an event gets triggered - updateFunc - onUpdate script target function - click - function to fire when clicking the datatext - onEnterFunc - function to fire OnEnter - onLeaveFunc - function to fire OnLeave, if not provided one will be set for you that hides the tooltip. -]] + DT:RegisterDatatext('Time', {"UPDATE_INSTANCE_INFO"}, OnEvent, Update, Click, OnEnter, OnLeave) \ No newline at end of file diff --git a/ElvUI_SLE/modules/datatexts/version.lua b/ElvUI_SLE/modules/datatexts/version.lua index d1f2f44..fa06b06 100755 --- a/ElvUI_SLE/modules/datatexts/version.lua +++ b/ElvUI_SLE/modules/datatexts/version.lua @@ -25,8 +25,8 @@ end local function OnEnter(self) DT:SetupTooltip(self) - DT.tooltip:AddDoubleLine("ElvUI "..L["Version"]..format(": |cff99ff33%s|r",Eversion)) - DT.tooltip:AddLine(L["SLE_AUTHOR_INFO"]..". "..L["Version"]..format(": |cff99ff33%s|r",SLE.version)) + DT.tooltip:AddDoubleLine("ElvUI "..GAME_VERSION_LABEL..format(": |cff99ff33%s|r", Eversion)) + DT.tooltip:AddLine(L["SLE_AUTHOR_INFO"]..". "..GAME_VERSION_LABEL..format(": |cff99ff33%s|r", SLE.version)) DT.tooltip:AddLine(" ") DT.tooltip:AddLine(L['SLE_CONTACTS']) @@ -42,5 +42,5 @@ local function ValueColorUpdate(hex, r, g, b) end E['valueColorUpdateFuncs'][ValueColorUpdate] = true -DT:RegisterDatatext("Version", {'PLAYER_ENTERING_WORLD'}, OnEvent, Update, Click, OnEnter) +DT:RegisterDatatext("S&L "..GAME_VERSION_LABEL, {'PLAYER_ENTERING_WORLD'}, OnEvent, Update, Click, OnEnter)