From edac505b76728510d71641b83d1ac433c5e94cfd Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 13 Oct 2014 08:22:30 +0400 Subject: [PATCH] Uncomment version check --- ElvUI_SLE/ElvUI_SLE.toc | 2 +- ElvUI_SLE/core/core.lua | 8 ++++---- ElvUI_SLE/core/staticpopups.lua | 4 ++-- ElvUI_SLE/locales/english.lua | 2 +- ElvUI_SLE/locales/russian.lua | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc index b56b840..f0458e3 100644 --- a/ElvUI_SLE/ElvUI_SLE.toc +++ b/ElvUI_SLE/ElvUI_SLE.toc @@ -11,7 +11,7 @@ ## DefaultState: Enabled ## X-Tukui-ProjectID: 42 ## X-Tukui-ProjectFolders: ElvUI_SLE -## X-ElvVersion: 7.0 +## X-ElvVersion: 7.00 libs\load_libs.xml locales\load_locales.xml diff --git a/ElvUI_SLE/core/core.lua b/ElvUI_SLE/core/core.lua index ff5d988..828c328 100644 --- a/ElvUI_SLE/core/core.lua +++ b/ElvUI_SLE/core/core.lua @@ -13,10 +13,10 @@ local elvR = tonumber(GetAddOnMetadata("ElvUI_SLE", "X-ElvVersion")) E.SLEConfigs = {} --SLE['media'] = {} ---[[function SLE:MismatchText() +function SLE:MismatchText() local text = format(L['MSG_OUTDATED'],elvV,elvR) return text -end]] +end local function AddTutorials() --Additional tutorials tinsert(E.TutorialList, #(E.TutorialList)+1, L["To enable full values of health/power on unitframes in Shadow & Light add \":sl\" to the end of the health/power tag.\nExample: [health:current:sl]."]); @@ -231,9 +231,9 @@ end function SLE:Initialize() --ElvUI's version check - --[[if elvV < elvR then + if elvV < elvR then E:StaticPopup_Show("VERSION_MISMATCH") - end]] + end EP:RegisterPlugin(addon, GetOptions) if E.private.unitframe.enable then self:RegisterEvent("PLAYER_REGEN_DISABLED", UF.Update_CombatIndicator); diff --git a/ElvUI_SLE/core/staticpopups.lua b/ElvUI_SLE/core/staticpopups.lua index 5016443..2837d44 100644 --- a/ElvUI_SLE/core/staticpopups.lua +++ b/ElvUI_SLE/core/staticpopups.lua @@ -1,13 +1,13 @@ local E, L, V, P, G = unpack(ElvUI); local SLE = E:GetModule('SLE') ---[[E.PopupDialogs["VERSION_MISMATCH"] = { +E.PopupDialogs["VERSION_MISMATCH"] = { text = SLE:MismatchText(), button1 = CLOSE, timeout = 0, whileDead = 1, preferredIndex = 3, -}]] +} E.PopupDialogs['ENHANCED_SLE_INCOMPATIBLE'] = { text = L['Oh lord, you have got ElvUI Enhanced and Shadow & Light both enabled at the same time. Select an addon to disable.'], diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index 7b61ba1..5dbe533 100644 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -20,7 +20,7 @@ L["Auto hide"] = true L["SLE_LOGIN_MSG"] = [=[You are using |cff1784d1Shadow & Light|r version |cff1784d1%s%s|r for ElvUI. If you wish to use the original ElvUI addon, disable this edit's plugin in your Addons manager. Have a nice day.]=] -L['MSG_OUTDATED'] = "Your version of ElvUI is older than recommended to use with Shadow & Light. Your version is |cff1784d1%s|r (recommended is |cff1784d1%s|r). Please update your ElvUI." +L['MSG_OUTDATED'] = "Your version of ElvUI is older than recommended to use with Shadow & Light. Your version is |cff1784d1%.2f|r (recommended is |cff1784d1%.2f|r). Please update your ElvUI." -- L["Your version of ElvUI is older than recommended to use with Shadow & Light. Please, download the latest version from tukui.org."] = true L["Reset All"] = true L["Reset all Shadow & Light options and movers to their defaults"] = true diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index 63b1711..da80334 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -20,7 +20,7 @@ L["Auto hide"] = "Автоматически скрывать" L["SLE_LOGIN_MSG"] = [=[Вы используете редакцию ElvUI под названием |cff1784d1"Shadow & Light"|r версия |cff1784d1%s%s|r. Если вы хотите использовать оригинальный ElvUI, просто отключите плагин этой редакции в вашем менеджере аддонов. Приятной игры.]=] -L['MSG_OUTDATED'] = "Ваша версия ElvUI старее, чем рекомендованная для использования с Shadow & Light. У Вас версия |cff1784d1%s|r (рекомендованая |cff1784d1%s|r). Пожалуйста, обновите ElvUI." +L['MSG_OUTDATED'] = "Ваша версия ElvUI старее, чем рекомендованная для использования с Shadow & Light. У Вас версия |cff1784d1%.2f|r (рекомендованая |cff1784d1%.2f|r). Пожалуйста, обновите ElvUI." -- L["Your version of ElvUI is older than recommended to use with Shadow & Light. Please, download the latest version from tukui.org."] = "Ваша версия ElvUI старее, чем рекомендованная для использования с Shadow & Light. Пожалуйста, скачайте последнюю версию с tukui.org." L["Reset All"] = "Сбросить все" L["Reset all Shadow & Light options and movers to their defaults"] = "Сбросить все настройки и фиксаторы редакции на умолчания" -- 1.7.9.5