From d465ab2f7a5e35bc547146aace08cd7869b0d35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Thu, 28 Mar 2024 19:08:47 +0100 Subject: [PATCH] Changes for new version syntax --- ElvUI/Core/General/Core.lua | 18 ++++++++++-------- ElvUI/Core/General/Install.lua | 2 +- ElvUI/Core/General/StatusReport.lua | 2 +- ElvUI/Core/init.lua | 17 ++++++++++++++--- ElvUI/ElvUI_Classic.toc | 2 +- ElvUI/ElvUI_Mainline.toc | 2 +- ElvUI/ElvUI_Wrath.toc | 2 +- ElvUI/Locales/deDE.lua | 2 +- ElvUI/Locales/enUS.lua | 2 +- ElvUI/Locales/esMX.lua | 2 +- ElvUI/Locales/frFR.lua | 2 +- ElvUI/Locales/itIT.lua | 2 +- ElvUI/Locales/koKR.lua | 2 +- ElvUI/Locales/ptBR.lua | 2 +- ElvUI/Locales/ruRU.lua | 2 +- ElvUI/Locales/trTR.lua | 2 +- ElvUI/Locales/zhCN.lua | 2 +- ElvUI/Locales/zhTW.lua | 2 +- ElvUI_Libraries/ElvUI_Libraries_Classic.toc | 2 +- ElvUI_Libraries/ElvUI_Libraries_Mainline.toc | 2 +- ElvUI_Libraries/ElvUI_Libraries_Wrath.toc | 2 +- ElvUI_Options/Core/Core.lua | 4 ++-- ElvUI_Options/ElvUI_Options_Classic.toc | 2 +- ElvUI_Options/ElvUI_Options_Mainline.toc | 2 +- ElvUI_Options/ElvUI_Options_Wrath.toc | 2 +- 25 files changed, 48 insertions(+), 35 deletions(-) diff --git a/ElvUI/Core/General/Core.lua b/ElvUI/Core/General/Core.lua index acaa1b9140..f797257dfa 100644 --- a/ElvUI/Core/General/Core.lua +++ b/ElvUI/Core/General/Core.lua @@ -62,7 +62,7 @@ local LSM = E.Libs.LSM E.noop = function() end E.title = format('%s%s|r', E.InfoColor, 'ElvUI') E.toc = tonumber(GetAddOnMetadata('ElvUI', 'X-Interface')) -E.version = tonumber(GetAddOnMetadata('ElvUI', 'Version')) +E.version, E.versionString = E:ParseVersionString('ElvUI') E.myfaction, E.myLocalizedFaction = UnitFactionGroup('player') E.myLocalizedClass, E.myclass, E.myClassID = UnitClass('player') E.myLocalizedRace, E.myrace, E.myRaceID = UnitRace('player') @@ -900,12 +900,14 @@ end do local SendMessageWaiting -- only allow 1 delay at a time regardless of eventing function E:SendMessage() - if IsInRaid() then - C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInRaid(LE_PARTY_CATEGORY_HOME) and IsInRaid(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'RAID') - elseif IsInGroup() then - C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInGroup(LE_PARTY_CATEGORY_HOME) and IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'PARTY') - elseif IsInGuild() then - C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, 'GUILD') + if E.version < 99999 then + if IsInRaid() then + C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInRaid(LE_PARTY_CATEGORY_HOME) and IsInRaid(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'RAID') + elseif IsInGroup() then + C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInGroup(LE_PARTY_CATEGORY_HOME) and IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'PARTY') + elseif IsInGuild() then + C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, 'GUILD') + end end SendMessageWaiting = nil @@ -2021,7 +2023,7 @@ function E:Initialize() end if E.db.general.loginmessage then - local msg = format(L["LOGIN_MSG"], E.version) + local msg = format(L["LOGIN_MSG"], E.versionString) if Chat.Initialized then msg = select(2, Chat:FindURL('CHAT_MSG_DUMMY', msg)) end print(msg) print(L["LOGIN_MSG_HELP"]) diff --git a/ElvUI/Core/General/Install.lua b/ElvUI/Core/General/Install.lua index 652d8139a1..c0f8ed525e 100644 --- a/ElvUI/Core/General/Install.lua +++ b/ElvUI/Core/General/Install.lua @@ -596,7 +596,7 @@ function E:SetPage(PageNum) f.Desc3:FontTemplate(nil, 16) if PageNum == 1 then - f.SubTitle:SetFormattedText(L["Welcome to ElvUI version %.2f!"], E.version) + f.SubTitle:SetFormattedText(L["Welcome to ElvUI version %s!"], E.versionString) f.Desc1:SetText(L["This install process will help you learn some of the features in ElvUI has to offer and also prepare your user interface for usage."]) f.Desc2:SetText(L["The in-game configuration menu can be accessed by typing the /ec command. Press the button below if you wish to skip the installation process."]) f.Desc3:SetText(L["Please press the continue button to go onto the next step."]) diff --git a/ElvUI/Core/General/StatusReport.lua b/ElvUI/Core/General/StatusReport.lua index d4c254942d..b72c54df6e 100644 --- a/ElvUI/Core/General/StatusReport.lua +++ b/ElvUI/Core/General/StatusReport.lua @@ -205,7 +205,7 @@ function E:UpdateStatusFrame() local PluginSection = PluginFrame.SectionP PluginSection.Header.Text:SetFormattedText('%sPlugins|r', valueColor) - StatusFrame.Section1.Content.Line1.Text:SetFormattedText('Version of ElvUI: |cff%s%.2f|r', (E.recievedOutOfDateMessage and 'ff3333') or (E.updateRequestTriggered and 'ff9933') or '33ff33', E.version) + StatusFrame.Section1.Content.Line1.Text:SetFormattedText('Version of ElvUI: |cff%s%s|r', (E.recievedOutOfDateMessage and 'ff3333') or (E.updateRequestTriggered and 'ff9933') or '33ff33', E.versionString) local addons, plugins = E:AreOtherAddOnsEnabled() StatusFrame.Section1.Content.Line2.Text:SetFormattedText('Other AddOns Enabled: |cff%s|r', (not addons and plugins and 'ff9933Plugins') or (addons and 'ff3333Yes') or '33ff33No') diff --git a/ElvUI/Core/init.lua b/ElvUI/Core/init.lua index fc3d8c0777..4f1ba0ba48 100644 --- a/ElvUI/Core/init.lua +++ b/ElvUI/Core/init.lua @@ -6,7 +6,7 @@ local _G = _G local gsub, tinsert, next = gsub, tinsert, next -local tostring, strfind, type = tostring, strfind, type +local tostring, strfind, type, strsub = tostring, strfind, type, strsub local CreateFrame = CreateFrame local GetBuildInfo = GetBuildInfo @@ -113,8 +113,19 @@ do -- this is different from E.locale because we need to convert for ace locale end end +function E:ParseVersionString(addon) + local versionString = GetAddOnMetadata(addon, 'Version') + if not strfind(versionString, '-') then + return tonumber(strsub(versionString, 2)), versionString + elseif strfind(versionString, 'project%-version') then + return 99999, 'Development' + else + return 99999, versionString + end +end + do - E.Libs = { version = tonumber(GetAddOnMetadata('ElvUI_Libraries', 'Version')) } + E.Libs = { version = E:ParseVersionString('ElvUI_Libraries') } E.LibsMinor = {} function E:AddLib(name, major, minor) if not name then return end @@ -340,4 +351,4 @@ function E:OnInitialize() elseif GetAddOnEnableState(E.myname, 'Tukui') == 2 then E:StaticPopup_Show('TUKUI_ELVUI_INCOMPATIBLE') end -end +end \ No newline at end of file diff --git a/ElvUI/ElvUI_Classic.toc b/ElvUI/ElvUI_Classic.toc index 4cdd48fd95..e2dd131d53 100644 --- a/ElvUI/ElvUI_Classic.toc +++ b/ElvUI/ElvUI_Classic.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bClassic|r ## Notes: User Interface Replacement ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## SavedVariables: ElvDB, ElvPrivateDB ## SavedVariablesPerCharacter: ElvCharacterDB ## OptionalDeps: SharedMedia, Tukui, Masque diff --git a/ElvUI/ElvUI_Mainline.toc b/ElvUI/ElvUI_Mainline.toc index b9de417eca..172f95bf61 100644 --- a/ElvUI/ElvUI_Mainline.toc +++ b/ElvUI/ElvUI_Mainline.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r ## Notes: User Interface Replacement ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## SavedVariables: ElvDB, ElvPrivateDB ## SavedVariablesPerCharacter: ElvCharacterDB ## OptionalDeps: SharedMedia, Tukui, Masque diff --git a/ElvUI/ElvUI_Wrath.toc b/ElvUI/ElvUI_Wrath.toc index 9db1621088..9c8f0fe1a0 100644 --- a/ElvUI/ElvUI_Wrath.toc +++ b/ElvUI/ElvUI_Wrath.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bWrath|r ## Notes: User Interface Replacement ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## SavedVariables: ElvDB, ElvPrivateDB ## SavedVariablesPerCharacter: ElvCharacterDB ## OptionalDeps: SharedMedia, Tukui, Masque diff --git a/ElvUI/Locales/deDE.lua b/ElvUI/Locales/deDE.lua index 0f7d0c6d99..937332cd09 100644 --- a/ElvUI/Locales/deDE.lua +++ b/ElvUI/Locales/deDE.lua @@ -210,7 +210,7 @@ L["List of installations in queue:"] = "Liste der Installationen in der Wartesch L["Loadouts"] = "Auslastungen" L["Location"] = "Standort" L["Lock"] = "Sperren" -L["LOGIN_MSG"] = ("Willkommen zu *ElvUI|r Version *%.2f|r, Tippe */ec|r um das Konfigurationsmenü aufzurufen. Für technische Hilfe, besuche das Supportforum unter https://tukui.org oder trete unserem Discord bei: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("Willkommen zu *ElvUI|r Version *%s|r, Tippe */ec|r um das Konfigurationsmenü aufzurufen. Für technische Hilfe, besuche das Supportforum unter https://tukui.org oder trete unserem Discord bei: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Please use */ehelp|r for a list of available *ElvUI|r commands."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333Du benutzt gerade nicht die *ElvUI|r Version für den Öffentlichen Testserver, was Probleme verursachen kann.|r ^Bitte downloade die PTR Version vom folgenden Link.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "Beute-/Alarmfenster" diff --git a/ElvUI/Locales/enUS.lua b/ElvUI/Locales/enUS.lua index 6ba4aa74bb..51ecda2141 100644 --- a/ElvUI/Locales/enUS.lua +++ b/ElvUI/Locales/enUS.lua @@ -210,7 +210,7 @@ L["List of installations in queue:"] = true L["Loadouts"] = true L["Location"] = true L["Lock"] = true -L["LOGIN_MSG"] = ("Welcome to *ElvUI|r version *%.2f|r, type */ec|r to access the in-game configuration menu. If you are in need of technical support you can visit us at https://tukui.org or join our Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("Welcome to *ElvUI|r version *%s|r, type */ec|r to access the in-game configuration menu. If you are in need of technical support you can visit us at https://tukui.org or join our Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Please use */ehelp|r for a list of available *ElvUI|r commands."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333You are currently not running the PTR version of *ElvUI|r which may cause issues.|r ^Please download the PTR version from the following link.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = true diff --git a/ElvUI/Locales/esMX.lua b/ElvUI/Locales/esMX.lua index 9c87cd1b83..61b4259c88 100644 --- a/ElvUI/Locales/esMX.lua +++ b/ElvUI/Locales/esMX.lua @@ -209,7 +209,7 @@ L["List of installations in queue:"] = "Lista de Instalaciones en cola:" L["Loadouts"] = true L["Location"] = true L["Lock"] = "Bloquear" -L["LOGIN_MSG"] = ("Bienvenido a *ElvUI|r versión *%.2f|r, escribe */ec|r para acceder al menú de configuración del juego. Si necesita ayuda, puede visítenos en https://tukui.org o unirse a nuestro Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("Bienvenido a *ElvUI|r versión *%s|r, escribe */ec|r para acceder al menú de configuración del juego. Si necesita ayuda, puede visítenos en https://tukui.org o unirse a nuestro Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Por favor, escriba */ehelp|r para obtener una lista de los comandos de *ElvUI|r disponibles."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333You are currently not running the PTR version of *ElvUI|r which may cause issues.|r ^Please download the PTR version from the following link.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "Marcos de Botín / Alerta" diff --git a/ElvUI/Locales/frFR.lua b/ElvUI/Locales/frFR.lua index e1e2343592..406cd6916a 100644 --- a/ElvUI/Locales/frFR.lua +++ b/ElvUI/Locales/frFR.lua @@ -210,7 +210,7 @@ L["List of installations in queue:"] = "Liste des installations en file d'attent L["Loadouts"] = "Chargements" L["Location"] = "Emplacement" L["Lock"] = "Verrouiller" -L["LOGIN_MSG"] = ("Bienvenue sur *ElvUI|r version *%.2f|r. Tapez */ec|r pour accéder au menu de configuration en jeu. Si vous avez besoin d'assistance technique, vous pouvez nous rendre visite sur https://tukui.org ou rejoindre notre serveur Discord : https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("Bienvenue sur *ElvUI|r version *%s|r. Tapez */ec|r pour accéder au menu de configuration en jeu. Si vous avez besoin d'assistance technique, vous pouvez nous rendre visite sur https://tukui.org ou rejoindre notre serveur Discord : https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Utilisez */ehelp|r pour obtenir la liste des commandes disponibles dans *ElvUI|r."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333Vous n'utilisez pas actuellement la version PTR de *ElvUI|r, ce qui peut causer des problèmes.|r ^Veuillez télécharger la version PTR depuis le lien suivant.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "Cadres de butin / alerte" diff --git a/ElvUI/Locales/itIT.lua b/ElvUI/Locales/itIT.lua index ee83a6d074..d1138491d7 100644 --- a/ElvUI/Locales/itIT.lua +++ b/ElvUI/Locales/itIT.lua @@ -209,7 +209,7 @@ L["List of installations in queue:"] = true L["Loadouts"] = true L["Location"] = true L["Lock"] = true -L["LOGIN_MSG"] = ("Welcome to *ElvUI|r version *%.2f|r, type */ec|r to access the in-game configuration menu. If you are in need of technical support you can visit us at https://tukui.org or join our Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("Welcome to *ElvUI|r version *%s|r, type */ec|r to access the in-game configuration menu. If you are in need of technical support you can visit us at https://tukui.org or join our Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Please use */ehelp|r for a list of available *ElvUI|r commands."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333You are currently not running the PTR version of *ElvUI|r which may cause issues.|r ^Please download the PTR version from the following link.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = true diff --git a/ElvUI/Locales/koKR.lua b/ElvUI/Locales/koKR.lua index e2730ebba6..c36c6f6028 100644 --- a/ElvUI/Locales/koKR.lua +++ b/ElvUI/Locales/koKR.lua @@ -209,7 +209,7 @@ L["List of installations in queue:"] = "설치 대기열 목록" L["Loadouts"] = "로드아웃" L["Location"] = "위치" L["Lock"] = "잠금" -L["LOGIN_MSG"] = ("*ElvUI|r 버전 *%.2f|r이 설치되었습니다.\n메뉴 호출은*/ec|r.기술 지원은 https://tukui.org \n또는,*Discord :|r https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("*ElvUI|r 버전 *%s|r이 설치되었습니다.\n메뉴 호출은*/ec|r.기술 지원은 https://tukui.org \n또는,*Discord :|r https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("*ElvUI|r 명령어 목록은 */ehelp|r를 입력하면 됩니다."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333현재 *ElvUI|r의 PTR 버전을 실행하고 있지 않아 문제가 발생할 수 있습니다.|r ^다음 링크에서 PTR 버전을 다운로드하십시오.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "획득/알림 창" diff --git a/ElvUI/Locales/ptBR.lua b/ElvUI/Locales/ptBR.lua index 0a64d462c6..35c9ebcfd6 100644 --- a/ElvUI/Locales/ptBR.lua +++ b/ElvUI/Locales/ptBR.lua @@ -209,7 +209,7 @@ L["List of installations in queue:"] = "Lista de instalações na fila:" L["Loadouts"] = true L["Location"] = true L["Lock"] = "Travar" -L["LOGIN_MSG"] = ("Bem-vindo ao *ElvUI|r versão *%.2f|r, digite */ec|r para acessar as configurações dentro do jogo. Se você precisa de suporte técnico nos contate em https://tukui.org ou se entre no Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("Bem-vindo ao *ElvUI|r versão *%s|r, digite */ec|r para acessar as configurações dentro do jogo. Se você precisa de suporte técnico nos contate em https://tukui.org ou se entre no Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Por favor use */ehelp|r para ver a lista de comandos do *ElvUI|r."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333You are currently not running the PTR version of *ElvUI|r which may cause issues.|r ^Please download the PTR version from the following link.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "Quadro de Saque / Alerta" diff --git a/ElvUI/Locales/ruRU.lua b/ElvUI/Locales/ruRU.lua index 734092e7ef..31de389c8b 100644 --- a/ElvUI/Locales/ruRU.lua +++ b/ElvUI/Locales/ruRU.lua @@ -209,7 +209,7 @@ L["List of installations in queue:"] = "Очередь установки:" L["Loadouts"] = "Шаблоны" L["Location"] = "Локация" L["Lock"] = "Закрепить" -L["LOGIN_MSG"] = ("Добро пожаловать в *ElvUI|r версии *%.2f|r, наберите */ec|r для доступа в меню настроек. Если Вам нужна техническая поддержка, посетите наш форум на https://tukui.org или присоединяйтесь к серверу Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("Добро пожаловать в *ElvUI|r версии *%s|r, наберите */ec|r для доступа в меню настроек. Если Вам нужна техническая поддержка, посетите наш форум на https://tukui.org или присоединяйтесь к серверу Discord: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Используйте */ehelp|r для вызова доступных команд *ElvUI|r."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333You are currently not running the PTR version of *ElvUI|r which may cause issues.|r ^Please download the PTR version from the following link.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "Розыгрыш/оповещения" diff --git a/ElvUI/Locales/trTR.lua b/ElvUI/Locales/trTR.lua index 3ee0baa130..1a12d688d1 100644 --- a/ElvUI/Locales/trTR.lua +++ b/ElvUI/Locales/trTR.lua @@ -210,7 +210,7 @@ L["List of installations in queue:"] = "Kuyruktaki kurulumlarin listesi:" L["Loadouts"] = true L["Location"] = true L["Lock"] = "Kilit" -L["LOGIN_MSG"] = ("*ElvUI|r surum *%.2f|r'ye hos geldiniz, oyun ici yapilandirma menusune erismek icin */ec|r yazin. Teknik destege ihtiyaciniz varsa bizi https://www.tukui adresinden ziyaret edebilirsiniz. .org veya Discord'umuza katilin: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("*ElvUI|r surum *%s|r'ye hos geldiniz, oyun ici yapilandirma menusune erismek icin */ec|r yazin. Teknik destege ihtiyaciniz varsa bizi https://www.tukui adresinden ziyaret edebilirsiniz. .org veya Discord'umuza katilin: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("Kullanilabilir *ElvUI|r komutlarinin listesi icin lutfen */ehelp|r kullanin."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333su anda *ElvUI|r'nin PTR surumunu calistirmiyorsunuz, bu da sorunlara neden olabilir.|r ^Lutfen asagidaki baglantidan PTR surumunu indirin.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "Ganimet / Uyari Cerceveleri" diff --git a/ElvUI/Locales/zhCN.lua b/ElvUI/Locales/zhCN.lua index f5f1d2de3e..4125d57599 100644 --- a/ElvUI/Locales/zhCN.lua +++ b/ElvUI/Locales/zhCN.lua @@ -209,7 +209,7 @@ L["List of installations in queue:"] = "即将安装的列表:" L["Loadouts"] = true L["Location"] = true L["Lock"] = "锁定" -L["LOGIN_MSG"] = ("欢迎使用*ElvUI|r 版本*%.2f|r，输入*/ec|r 访问游戏内配置菜单。如果您需要技术支持，您可以访问我们的 https://tukui.org 或加入我们的 Discord：https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("欢迎使用*ElvUI|r 版本*%s|r，输入*/ec|r 访问游戏内配置菜单。如果您需要技术支持，您可以访问我们的 https://tukui.org 或加入我们的 Discord：https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("请使用 */ehelp|r 获取可用的 *ElvUI|r 命令列表。"):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333您当前未运行 *ElvUI|r 的 PTR 版本，这可能会导致问题|r ^请从以下链接下载 PTR 版本。|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "拾取/提醒框" diff --git a/ElvUI/Locales/zhTW.lua b/ElvUI/Locales/zhTW.lua index c11bd6a57a..9a77afaff3 100644 --- a/ElvUI/Locales/zhTW.lua +++ b/ElvUI/Locales/zhTW.lua @@ -209,7 +209,7 @@ L["List of installations in queue:"] = "即將安裝的列表" L["Loadouts"] = "配置" L["Location"] = true L["Lock"] = "鎖定" -L["LOGIN_MSG"] = ("歡迎使用 *ElvUI|r *%.2f 版本|r, 輸入 */ec|r 可打開遊戲內設置介面. 如果你需要技術協助, 可訪問我們的網址 https://tukui.org 或是加入我們的 Discord 伺服器: https://discord.tukui.org"):gsub('*', E.InfoColor) +L["LOGIN_MSG"] = ("歡迎使用 *ElvUI|r *%s 版本|r, 輸入 */ec|r 可打開遊戲內設置介面. 如果你需要技術協助, 可訪問我們的網址 https://tukui.org 或是加入我們的 Discord 伺服器: https://discord.tukui.org"):gsub('*', E.InfoColor) L["LOGIN_MSG_HELP"] = ("請使用 */ehelp|r 以獲取可用的 *ElvUI|r 命令."):gsub('*', E.InfoColor) L["LOGIN_PTR"] = ("|cffff3333由於你沒有在使用 PTR 版本的 *ElvUI|r, 游戲可能會產生錯誤.|r ^請使用下列鏈接下載 PTR 版本.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2) L["Loot / Alert Frames"] = "拾取 / 提醒框架" diff --git a/ElvUI_Libraries/ElvUI_Libraries_Classic.toc b/ElvUI_Libraries/ElvUI_Libraries_Classic.toc index 7b3039e031..02ef374817 100644 --- a/ElvUI_Libraries/ElvUI_Libraries_Classic.toc +++ b/ElvUI_Libraries/ElvUI_Libraries_Classic.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bLibraries|r ## Notes: Libraries that power ElvUI ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## Interface: 11501 ## OptionalDeps: LibHealComm-4.0 ## X-oUF: ElvUF diff --git a/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc b/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc index 395cd6d8fd..1b0a7866fc 100644 --- a/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc +++ b/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bLibraries|r ## Notes: Libraries that power ElvUI ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## Interface: 100206 ## X-oUF: ElvUF ## IconTexture: Interface\AddOns\ElvUI\Core\Media\Textures\LogoAddon diff --git a/ElvUI_Libraries/ElvUI_Libraries_Wrath.toc b/ElvUI_Libraries/ElvUI_Libraries_Wrath.toc index e8c5c67be1..9d2c19859f 100644 --- a/ElvUI_Libraries/ElvUI_Libraries_Wrath.toc +++ b/ElvUI_Libraries/ElvUI_Libraries_Wrath.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bLibraries|r ## Notes: Libraries that power ElvUI ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## Interface: 30403 ## OptionalDeps: LibHealComm-4.0 ## X-oUF: ElvUF diff --git a/ElvUI_Options/Core/Core.lua b/ElvUI_Options/Core/Core.lua index 125f147e18..279947524b 100644 --- a/ElvUI_Options/Core/Core.lua +++ b/ElvUI_Options/Core/Core.lua @@ -10,7 +10,7 @@ local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMet local ACH = E.Libs.ACH local L = E.Libs.ACL:GetLocale('ElvUI', E.global.general.locale) local C = { - version = tonumber(GetAddOnMetadata('ElvUI_Options', 'Version')), + version = E:ParseVersionString('ElvUI_Options'), Blank = function() return '' end, SearchCache = {}, SearchText = '', @@ -138,7 +138,7 @@ end E.Libs.AceConfig:RegisterOptionsTable('ElvUI', E.Options) E.Libs.AceConfigDialog:SetDefaultSize('ElvUI', E:Config_GetDefaultSize()) -E.Options.name = format('%s: |cff99ff33%.2f|r', L["Version"], E.version) +E.Options.name = format('%s: |cff99ff33%s|r', L["Version"], E.versionString) local DEVELOPERS = { 'Tukz', diff --git a/ElvUI_Options/ElvUI_Options_Classic.toc b/ElvUI_Options/ElvUI_Options_Classic.toc index c953932f75..9663afbab0 100644 --- a/ElvUI_Options/ElvUI_Options_Classic.toc +++ b/ElvUI_Options/ElvUI_Options_Classic.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bOptions|r ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## Interface: 11501 ## RequiredDeps: ElvUI ## LoadOnDemand: 1 diff --git a/ElvUI_Options/ElvUI_Options_Mainline.toc b/ElvUI_Options/ElvUI_Options_Mainline.toc index c641750eb6..2d9d467e6d 100644 --- a/ElvUI_Options/ElvUI_Options_Mainline.toc +++ b/ElvUI_Options/ElvUI_Options_Mainline.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bOptions|r ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## Interface: 100206 ## RequiredDeps: ElvUI ## LoadOnDemand: 1 diff --git a/ElvUI_Options/ElvUI_Options_Wrath.toc b/ElvUI_Options/ElvUI_Options_Wrath.toc index 34830c0919..9259de0632 100644 --- a/ElvUI_Options/ElvUI_Options_Wrath.toc +++ b/ElvUI_Options/ElvUI_Options_Wrath.toc @@ -1,7 +1,7 @@ ## Title: |cff1784d1ElvUI|r |cfd9b9b9bOptions|r ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r ## Author: Elv, Simpy -## Version: 13.60 +## Version: @project-version@ ## Interface: 30403 ## RequiredDeps: ElvUI ## LoadOnDemand: 1