Skip to content

Commit

Permalink
Merge pull request #178 from Vapok/classic_era
Browse files Browse the repository at this point in the history
fixing stupid mistake
  • Loading branch information
Taidtuskecyh authored Jun 18, 2021
2 parents 509ee95 + c8a622b commit 79925a0
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 23 deletions.
4 changes: 3 additions & 1 deletion CommunityDKP.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Interface: 11305
## Interface: 11307
## Interface-Classic: 11307
## Interface-BCC: 20501
## Title: |cff9900ffCommunity|r |cff595959DKP|r
## Author: Vapok-BloodsailBuccaneers
## Notes: Feature-rich DKP Management Tool
Expand Down
8 changes: 5 additions & 3 deletions Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ core.EncounterList = { -- Event IDs must be in the exact same order as core
core.CommDKPUI = {} -- global storing entire Configuration UI to hide/show UI
core.MonVersion = "v3.2.8";
core.BuildNumber = 30208;
core.ReleaseNumber = 68
core.ReleaseNumber = 69
core.defaultTable = "__default";
core.SemVer = core.MonVersion.."-r"..tostring(core.ReleaseNumber);
core.UpgradeSchema = false;
Expand Down Expand Up @@ -506,10 +506,12 @@ end

function CommDKP:CreateContainer(parent, name, header)

local f;

if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
local f = CreateFrame("Frame", "CommDKP"..name, parent);
f = CreateFrame("Frame", "CommDKP"..name, parent);
elseif WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
local f = CreateFrame("Frame", "CommDKP"..name, parent, BackdropTemplateMixin and "BackdropTemplate" or nil);
f = CreateFrame("Frame", "CommDKP"..name, parent, BackdropTemplateMixin and "BackdropTemplate" or nil);
end


Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.cn.lua
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ if GetLocale() == "zhCN" then
MIGRATIONCOMPLETED = "Migration complete.|n|nPlease disable MonolithDKP and /reload the UI.", --TODO TRANSLATE:

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.de.lua
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ if GetLocale() == "deDE" then
MIGRATIONCOMPLETED = "Migration abgeschlossen.|n|nBitte deaktivieren Sie MonolithDKP und laden Sie das UI neu. (/reload)",

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.en.lua
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ core.L = {
MIGRATIONCANCELED = "Migration canceled.|n|nPlease disable MonolithDKP and /reload the UI if you want to continue with CommunityDKP without using your current tables and settings.",
MIGRATIONCOMPLETED = "Migration complete.|n|nPlease disable MonolithDKP and /reload the UI.",

CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.es.lua
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ if GetLocale() == "esES" or GetLocale() == "esMX" then
MIGRATIONCOMPLETED = "Migration complete.|n|nPlease disable MonolithDKP and /reload the UI.", --TODO TRANSLATE:

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.fr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ if GetLocale() == "frFR" then
MIGRATIONCOMPLETED = "Migration réussie.|n|nVeuillez désactiver MonolithDKP et recharger votre interface (/reload).", --TODO TRANSLATE:

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.kr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ if GetLocale() == "koKR" then
MIGRATIONCOMPLETED = "Migration complete.|n|nPlease disable MonolithDKP and /reload the UI.", --TODO TRANSLATE:

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.ru.lua
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ if GetLocale() == "ruRU" then
MIGRATIONCOMPLETED = "Миграция завершена.|n|nПожалуйста отключите MonolithDKP и перезагрузите интерфейс.",

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.se.lua
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ core.L = {
MIGRATIONCOMPLETED = "Migration complete.|n|nPlease disable MonolithDKP and /reload the UI.",

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed class filters (shamans / paladins)",
CHANGELOG3 = " - fixed class graph (9th class)",
CHANGELOG4 = " - updated version in the header",
Expand Down
2 changes: 1 addition & 1 deletion Localization/Localization.tw.lua
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ if GetLocale() == "zhTW" then
MIGRATIONCOMPLETED = "Migration complete.|n|nPlease disable MonolithDKP and /reload the UI.", --TODO TRANSLATE:

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.8-r68-bcc",
CHANGELOG1 = "CommunityDKP - v3.2.8-r69-bcc",
CHANGELOG2 = " - fixed UI for classic era realms",
CHANGELOG3 = "",
CHANGELOG4 = "",
Expand Down
6 changes: 4 additions & 2 deletions Modules/Award.lua
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,12 @@ end

local function AwardConfirm_Create()

local f;

if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_AwardWindowConfirm", UIParent, "ShadowOverlaySmallTemplate");
f = CreateFrame("Frame", "CommDKP_AwardWindowConfirm", UIParent, "ShadowOverlaySmallTemplate");
elseif WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_AwardWindowConfirm", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
f = CreateFrame("Frame", "CommDKP_AwardWindowConfirm", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
end

f:SetPoint("TOP", UIParent, "TOP", 0, -200);
Expand Down
6 changes: 4 additions & 2 deletions Modules/BidInterface.lua
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,12 @@ end

local function BidWindowCreateRow(parent, id) -- Create 3 buttons for each row in the list

local f;

if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_BidderWindow", UIParent, "ShadowOverlaySmallTemplate");
f = CreateFrame("Frame", "CommDKP_BidderWindow", UIParent, "ShadowOverlaySmallTemplate");
elseif WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
local f = CreateFrame("Button", "$parentLine"..id, parent)
f = CreateFrame("Button", "$parentLine"..id, parent)
end

f.Strings = {}
Expand Down
6 changes: 4 additions & 2 deletions Modules/Bidding.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1206,10 +1206,12 @@ end

function CommDKP:CreateBidWindow()

local f;

if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_BiddingWindow", UIParent, "ShadowOverlaySmallTemplate");
f = CreateFrame("Frame", "CommDKP_BiddingWindow", UIParent, "ShadowOverlaySmallTemplate");
elseif WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_BiddingWindow", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
f = CreateFrame("Frame", "CommDKP_BiddingWindow", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
end

mode = core.DB.modes.mode;
Expand Down
6 changes: 4 additions & 2 deletions Modules/DKPModes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ end

function CommDKP:DKPModesFrame_Create()

local f;

if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_DKPModesFrame", UIParent);
f = CreateFrame("Frame", "CommDKP_DKPModesFrame", UIParent);
elseif WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_DKPModesFrame", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
f = CreateFrame("Frame", "CommDKP_DKPModesFrame", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
end

local ActiveMode = core.DB.modes.mode;
Expand Down
6 changes: 4 additions & 2 deletions Modules/ZeroSumBank.lua
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ end

function CommDKP:ZeroSumBank_Create()

local f;

if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_DKPZeroSumBankFrame", UIParent, "ShadowOverlaySmallTemplate");
f = CreateFrame("Frame", "CommDKP_DKPZeroSumBankFrame", UIParent, "ShadowOverlaySmallTemplate");
elseif WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
local f = CreateFrame("Frame", "CommDKP_DKPZeroSumBankFrame", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
f = CreateFrame("Frame", "CommDKP_DKPZeroSumBankFrame", UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil);
end

if not core.DB.modes.ZeroSumBank then core.DB.modes.ZeroSumBank = 0 end
Expand Down

0 comments on commit 79925a0

Please sign in to comment.