diff --git a/ARLConfig.lua b/ARLConfig.lua index e8c6470..dd6e0ca 100644 --- a/ARLConfig.lua +++ b/ARLConfig.lua @@ -259,7 +259,7 @@ local function giveFilter() seasonal = { order = 6, type = "toggle", - name = L["Seasonal"], + name = GetCategoryInfo(155), desc = L["SEASONAL_DESC"], get = function() return addon.db.profile.filters.obtain.seasonal end, set = function() addon.db.profile.filters.obtain.seasonal = not addon.db.profile.filters.obtain.seasonal end, diff --git a/ARLFrame.lua b/ARLFrame.lua index 0716cd4..bd05ba9 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -69,6 +69,8 @@ local IsShiftKeyDown = IsShiftKeyDown local IsAltKeyDown = IsAltKeyDown local IsControlKeyDown = IsControlKeyDown +local seasonal = GetCategoryInfo(155) + -- Fallback in case the user doesn't have LSM-3.0 installed if (not LibStub:GetLibrary("LibSharedMedia-3.0", true)) then @@ -105,7 +107,7 @@ local arlTooltip = _G["arlTooltip"] local arlTooltip2 = _G["arlTooltip2"] local addonversion = GetAddOnMetadata("AckisRecipeList", "Version") -addonversion = string.gsub(addonversion, "@project.revision@", "SVN") +addonversion = string.gsub(addonversion,"@project.revision@","SVN") local ARL_SearchText,ARL_LastSearchedText local ARL_ExpGeneralOptCB,ARL_ExpObtainOptCB,ARL_ExpBindingOptCB,ARL_ExpItemOptCB,ARL_ExpPlayerOptCB,ARL_ExpRepOptCB,ARL_RepOldWorldCB,ARL_RepBCCB,ARL_RepLKCB,ARL_ExpMiscOptCB @@ -917,7 +919,7 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude) local ssnname = seasonDB[v["ID"]]["Name"] clr1 = addon:hexcolor("SEASON") - gttAdd(0, -1, 0, 0, L["Seasonal"], clr1, ssnname, clr1) + gttAdd(0, -1, 0, 0, seasonal, clr1, ssnname, clr1) -- Reputation elseif (v["Type"] == 6) then @@ -2430,7 +2432,7 @@ local function expandEntry(dsIndex) t.sID = recipeIndex t.IsExpanded = true - local tStr = addon:Season(L["Seasonal"] .. " : " .. ssnname) + local tStr = addon:Season(seasonal .. " : " .. ssnname) t.String = pad .. tStr tinsert(DisplayStrings, dsIndex, t) @@ -3980,7 +3982,7 @@ function addon:CreateFrame( ARL_QuestCBText:SetText(L["Quest"]) local ARL_SeasonalCB = CreateFrame("CheckButton", "ARL_SeasonalCB", addon.Fly_Obtain, "UICheckButtonTemplate") addon:GenericMakeCB(ARL_SeasonalCB, addon.Fly_Obtain, L["SEASONAL_DESC"], 10, 4, 1, 0) - ARL_SeasonalCBText:SetText(L["Seasonal"]) + ARL_SeasonalCBText:SetText(seasonal) local ARL_TrainerCB = CreateFrame("CheckButton", "ARL_TrainerCB", addon.Fly_Obtain, "UICheckButtonTemplate") addon:GenericMakeCB(ARL_TrainerCB, addon.Fly_Obtain, L["TRAINER_DESC"], 11, 5, 1, 0) ARL_TrainerCBText:SetText(L["Trainer"]) diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua index 85c73ee..8ad6366 100644 --- a/Locals/testenUS.lua +++ b/Locals/testenUS.lua @@ -252,8 +252,7 @@ L["Raid"] = true L["RAID_DESC"] = "Recipes obtained in raids (ie: Molten Core, Serpent Shrine Cavern, etc.) should be included in the scan." L["Quest"] = true L["QUEST_DESC"] = "Recipes obtained as quest rewards should be included in the scan." -L["Seasonal"] = true -L["SEASONAL_DESC"] = "Recipes obtained in seasonal events should be included in the scan." +L["SEASONAL_DESC"] = "Recipes obtained in world events should be included in the scan." L["Trainer"] = true L["TRAINER_DESC"] = "Recipes learned from trainers should be included in the scan." L["Vendor"] = true @@ -398,15 +397,7 @@ L["MISSING_LIBRARY"] = "%s is missing. Addon cannot run." -- Drop Obtain Info L["Unknown Zone"] = true --- Special Event information -L["Midsummer Fire Festival"] = true -L["Feast of Winters Veil"] = true -L["Lunar Festival"] = true -L["Darkmoon Faire"] = true -L["Seasonal"] = true - -- Custom database strings (Need way better descriptions, just filler right now): - L["Custom1"] = "Discovered by making elixirs or flasks using Burning Crusade or higher ingredients." L["Custom2"] = "Discovered by making potions using Burning Crusade or higher ingredients." L["Custom3"] = "Discovered by doing transmutes using Burning Crusade or higher ingredients." diff --git a/RecipeDB/ARL-Seasonal.lua b/RecipeDB/ARL-Seasonal.lua index 69661cd..ff8149d 100644 --- a/RecipeDB/ARL-Seasonal.lua +++ b/RecipeDB/ARL-Seasonal.lua @@ -28,12 +28,21 @@ local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME) local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) +local GetCategoryInfo = GetCategoryInfo + function addon:InitSeasons(SeasonDB) - self:addLookupList(SeasonDB,1,L["Feast of Winters Veil"],"N/A") - self:addLookupList(SeasonDB,2,L["Lunar Festival"],"N/A") - self:addLookupList(SeasonDB,3,L["Darkmoon Faire"],"N/A") - self:addLookupList(SeasonDB,4,L["Midsummer Fire Festival"],"N/A") - self:addLookupList(SeasonDB,5,"Thanksgiving Seasonal Placeholder - Speculation","N/A") + local name = "" + local seasonal = GetCategoryInfo(155) + + name = GetCategoryInfo(156) + self:addLookupList(SeasonDB,1,name,seasonal) + name = GetCategoryInfo(160) + self:addLookupList(SeasonDB,2,name,seasonal) + name = GetCategoryInfo(157) + self:addLookupList(SeasonDB,3,name,seasonal) + name = GetCategoryInfo(161) + self:addLookupList(SeasonDB,4,name,seasonal) + self:addLookupList(SeasonDB,5,"Thanksgiving Seasonal Placeholder - Speculation",seasonal) end