diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index ddc3283..ffc2e4b 100644 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -752,7 +752,6 @@ L["AddOns Manager"] = true L["Click to toggle the AddOn Manager frame."] = true L["Boss Mod"] = true L["Click to toggle the Configuration/Option Window from the Bossmod you have enabled."] = true -L["Custom"] = true L["UB_DESC"] = "This adds a small bar with some useful buttons which acts as a small menu for common things." L["Minimum Roll Value"] = true L["The lower limit for custom roll button."] = true diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index 9c240fd..62389e5 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -743,7 +743,6 @@ L["Click to reload your interface"] = "Нажмите для перезагру L["Click to unlock moving ElvUI elements"] = "Нажмите для входа в режим перемещения элементов" L["Click to toggle the AddOn Manager frame."] = "Нажмите для отображения окна менеджера аддонов." L["Click to toggle the Configuration/Option Window from the Bossmod you have enabled."] = "Нажмите для отображения окна настроек включенного босс мода." -L["Custom"] = "Свое" L["Minimum Roll Value"] = "Минимальное значение броска" L["The lower limit for custom roll button."] = "Нижняя граница броска при использовании собственных установок." L["Maximum Roll Value"] = "Масимальное значение броска" diff --git a/ElvUI_SLE/modules/Armory/Config.lua b/ElvUI_SLE/modules/Armory/Config.lua index 5c95ccb..81daa4b 100644 --- a/ElvUI_SLE/modules/Armory/Config.lua +++ b/ElvUI_SLE/modules/Armory/Config.lua @@ -11,6 +11,7 @@ local MAX_NUM_SOCKETS = MAX_NUM_SOCKETS local ALTERNATE_RESOURCE_TEXT, DAMAGE, ATTACK_POWER, ATTACK_SPEED, STAT_SPELLPOWER, STAT_ENERGY_REGEN, STAT_RUNE_REGEN, STAT_FOCUS_REGEN, STAT_SPEED, DURABILITY, HIDE = ALTERNATE_RESOURCE_TEXT, DAMAGE, ATTACK_POWER, ATTACK_SPEED, STAT_SPELLPOWER, STAT_ENERGY_REGEN, STAT_RUNE_REGEN, STAT_FOCUS_REGEN, STAT_SPEED, DURABILITY, HIDE local FACTION_ALLIANCE, FACTION_HORDE, ARENA, NONE, STAT_CATEGORY_ATTRIBUTES, STAT_CATEGORY_ATTRIBUTES = FACTION_ALLIANCE, FACTION_HORDE, ARENA, NONE, STAT_CATEGORY_ATTRIBUTES, STAT_CATEGORY_ATTRIBUTES local ADD, DELETE, HEALTH = ADD, DELETE, HEALTH +local CUSTOM = CUSTOM if not (KF and KF.Modules and (KF.Modules.CharacterArmory or KF.Modules.InspectArmory)) then return end @@ -209,7 +210,7 @@ local function LoadArmoryConfigTable() local BackgroundList = { ["0"] = HIDE, - ["1"] = L["Custom"], + ["1"] = CUSTOM, ["2"] = "Space", ["3"] = "The Empire", ["4"] = "Castle", diff --git a/ElvUI_SLE/modules/uibuttons.lua b/ElvUI_SLE/modules/uibuttons.lua index c7e237c..a07f63c 100644 --- a/ElvUI_SLE/modules/uibuttons.lua +++ b/ElvUI_SLE/modules/uibuttons.lua @@ -7,6 +7,7 @@ local SendChatMessage = SendChatMessage local ReloadUI = ReloadUI --GLOBALS: DBM, VEM, LibStub, Altoholic, AtlasLoot, xCT_Plus, Swatter, SlashCmdList local _G = _G +local CUSTOM = CUSTOM local function CustomRollCall() local min, max = T.tonumber(E.db.sle.uibuttons.customroll.min), T.tonumber(E.db.sle.uibuttons.customroll.max) @@ -58,7 +59,7 @@ function UB:RollSetup(menu) menu:CreateDropdownButton("Roll", "Thirty", "1-30", nil, nil, function() RandomRoll(1, 30) end) menu:CreateDropdownButton("Roll", "Forty", "1-40", nil, nil, function() RandomRoll(1, 40) end) menu:CreateDropdownButton("Roll", "Hundred", "1-100", nil, nil, function() RandomRoll(1, 100) end) - menu:CreateDropdownButton("Roll", "Custom", L["Custom"], nil, nil, function() CustomRollCall() end) + menu:CreateDropdownButton("Roll", "Custom", CUSTOM, nil, nil, function() CustomRollCall() end) end function UB:SetupBar(menu) diff --git a/ElvUI_SLE/options/minimap/locpanel_c.lua b/ElvUI_SLE/options/minimap/locpanel_c.lua index cb9a91a..04ffff9 100644 --- a/ElvUI_SLE/options/minimap/locpanel_c.lua +++ b/ElvUI_SLE/options/minimap/locpanel_c.lua @@ -1,6 +1,6 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local LP = SLE:GetModule("LocationPanel") -local DEFAULT = DEFAULT +local DEFAULT, CUSTOM = DEFAULT, CUSTOM local function configTable() if not SLE.initialized then return end E.Options.args.sle.args.modules.args.minimap.args.locPanel = { @@ -86,7 +86,7 @@ local function configTable() values = { ["REACTION"] = L["Reaction"], ["DEFAULT"] = DEFAULT, - ["CUSTOM"] = L["Custom"], + ["CUSTOM"] = CUSTOM, }, }, customColor = { diff --git a/ElvUI_SLE/options/raidmarkers_c.lua b/ElvUI_SLE/options/raidmarkers_c.lua index ee84701..8a0801e 100644 --- a/ElvUI_SLE/options/raidmarkers_c.lua +++ b/ElvUI_SLE/options/raidmarkers_c.lua @@ -2,6 +2,7 @@ local RM = SLE:GetModule('RaidMarkers') local SHIFT_KEY, CTRL_KEY, ALT_KEY = SHIFT_KEY, CTRL_KEY, ALT_KEY local AGGRO_WARNING_IN_PARTY = AGGRO_WARNING_IN_PARTY +local CUSTOM = CUSTOM local function configTable() if not SLE.initialized then return end E.Options.args.sle.args.modules.args.raidmarkerbars = { @@ -104,7 +105,7 @@ local function configTable() ["DEFAULT"] = DEFAULT, ["INPARTY"] = AGGRO_WARNING_IN_PARTY, ["ALWAYS"] = L["Always Display"], - ["CUSTOM"] = L["Custom"], + ["CUSTOM"] = CUSTOM, }, }, customVisibility = { diff --git a/ElvUI_SLE/options/uibuttons_c.lua b/ElvUI_SLE/options/uibuttons_c.lua index f6c59b3..0a0bbbb 100644 --- a/ElvUI_SLE/options/uibuttons_c.lua +++ b/ElvUI_SLE/options/uibuttons_c.lua @@ -1,6 +1,8 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local UB = SLE:GetModule('UIButtons') +local CUSTOM, NONE, DEFAULT = CUSTOM, NONE, DEFAULT + local positionValues = { TOPLEFT = 'TOPLEFT', LEFT = 'LEFT', @@ -341,7 +343,7 @@ local function configTable() ["Thirty"] = "1-30", ["Forty"] = "1-40", ["Hundred"] = "1-100", - ["Custom"] = L["Custom"], + ["Custom"] = CUSTOM, }, get = function(info) return E.db.sle.uibuttons.Roll.called end, diff --git a/ElvUI_SLE/options/unitframes_c.lua b/ElvUI_SLE/options/unitframes_c.lua index dfe9e05..41843d1 100644 --- a/ElvUI_SLE/options/unitframes_c.lua +++ b/ElvUI_SLE/options/unitframes_c.lua @@ -3,6 +3,7 @@ local UF = E:GetModule('UnitFrames'); local SUF = SLE:GetModule("UnitFrames") local texPath = [[Interface\AddOns\ElvUI_SLE\media\textures\role\]] local texPathE = [[Interface\AddOns\ElvUI\media\textures\]] +local CUSTOM = CUSTOM local function configTable() if not SLE.initialized then return end @@ -41,7 +42,7 @@ local function configTable() ["SKULL"] = [[|TInterface\LootFrame\LootPanel-Icon:14|t]], ["PASS"] = [[|TInterface\PaperDollInfoFrame\UI-GearManager-LeaveItem-Transparent:14|t]], ["NOTREADY"] = [[|TInterface\RAIDFRAME\ReadyCheck-NotReady:14|t]], - ["CUSTOM"] = L["Custom"], + ["CUSTOM"] = CUSTOM, }, }, CustomTexture = { @@ -155,7 +156,7 @@ local function configTable() values = { ["DEFAULT"] = DEFAULT, ["SVUI"] = "Supervillian UI", - ["CUSTOM"] = L["Custom"], + ["CUSTOM"] = CUSTOM, }, }, customTexture = {