Skip to content

Commit 30ddaf4

Browse files
committed
fix(startFrame): Fix AzerothCore Revision, Players counters
1 parent 20f4ba4 commit 30ddaf4

4 files changed

Lines changed: 18 additions & 17 deletions

File tree

AzerothCoreAdmin.lua

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fID = 0
3030
gettingGOBinfo=0
3131
gettingGOBinfoinfo=0
3232

33-
MAJOR_VERSION = "TrinityAdmin-3.3.5"
34-
MINOR_VERSION = "$Revision: 058 $"
33+
MAJOR_VERSION = "AzerothCoreAdmin"
34+
MINOR_VERSION = "$Revision: 001 $"
3535
ROOT_PATH = "Interface\\AddOns\\AzerothCoreAdmin\\"
3636
local cont = ""
3737
if not AceLibrary then error(MAJOR_VERSION .. " requires AceLibrary") end
@@ -906,13 +906,16 @@ function MangAdmin:AddMessage(frame, text, r, g, b, id)
906906
-- output = MangAdmin.db.account.style.showchat
907907
output = MangAdmin.db.account.style.showchat
908908
end
909-
for users, maxusers in string.gmatch(text, Strings["ma_GmatchOnlinePlayers"]) do
909+
for users, usersworld in string.gmatch(text, Strings["ma_GmatchOnlinePlayers"]) do
910910
ma_infoonlinetext:SetText(Locale["info_online"]..users)
911-
ma_infomaxonlinetext:SetText(Locale["info_maxonline"]..maxusers)
911+
ma_infoonlineworldtext:SetText(Locale["info_online_world"]..usersworld)
912912
catchedSth = true
913913
-- output = MangAdmin.db.account.style.showchat
914914
output = MangAdmin.db.account.style.showchat
915915
end
916+
for maxusers in string.gmatch(text, "Connection peak: (%d+).") do
917+
ma_infomaxonlinetext:SetText(Locale["info_maxonline"]..maxusers)
918+
end
916919
for uptime in string.gmatch(text, Strings["ma_GmatchUptime"]) do
917920
ma_infouptimetext:SetText(Locale["info_uptime"]..uptime)
918921
catchedSth = true

Frames/MangFrames_SectionChar.lua

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
-------------------------------------------------------------------------------------------------------------
22
--
3-
-- TrinityAdmin Version 3.x
4-
-- TrinityAdmin is a derivative of MangAdmin.
3+
-- AzerothCoreAdmin is a derivative of TrinityAdmin and MangAdmin.
54
--
65
-- Copyright (C) 2018 Free Software Foundation, Inc.
76
-- License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
@@ -10,12 +9,10 @@
109
--
1110
-- You should have received a copy of the GNU General Public License
1211
-- along with this program; if not, write to the Free Software
13-
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1397 USA
12+
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
13+
--
14+
-- Official repository: https://github.com/LightDestory/AzerothCoreAdmin
1415
--
15-
-- Official Forums: http://groups.google.com/group/trinityadmin
16-
-- GoogleCode Website: http://code.google.com/p/trinityadmin/
17-
-- Subversion Repository: http://trinityadmin.googlecode.com/svn/
18-
-- Dev Blog: http://trinityadmin.blogspot.com/
1916
-------------------------------------------------------------------------------------------------------------
2017

2118
-- Initializing dynamic frames with LUA and FrameLib

Locales/enUS.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ How to add a localised string:
3030
["strength"] = "Stärke",
3131
6. Some of these lines also contain color codes (example: |cFF00FF00 and |r) Don't alter these, please.
3232
33-
TrinityAdmin Locale Team:
33+
AzerothCoreAdmin Locale Team:
3434
You have received this file which currently contains enUS strings, but will actually be the file for your
3535
selected language.
3636
1. Edit the first un-commented line below, which should resemble: function Return_enUS(). Change
@@ -60,9 +60,10 @@ function Return_enUS()
6060
["tt_LanguageButton"] = "Reload AzerothCoreAdmin.", --Removed locals. Updated tooltip to just reload
6161
--[[Control Labels]]
6262
["ma_LanguageButton"] = "Change language",
63-
["info_revision"] = "|cFF00FF00AzerothCoreAdmin rev:|r ", --Updated: Matched string output to TrinityCore
63+
["info_revision"] = "|cFF00FF00AzerothCore rev:|r ", --Updated: Matched string output to AzerothCore
6464
["info_platform"] = "|cFF00FF00Server Platform:|r ",
6565
["info_online"] = "|cFF00FF00Players Online:|r ",
66+
["info_online_world"] = "|cFF00FF00Players in world:|r ",
6667
["info_maxonline"] = "|cFF00FF00Maximum Online:|r ",
6768
["info_uptime"] = "|cFF00FF00Uptime:|r ",
6869
["ma_CloseWindow"] = "X",
@@ -87,7 +88,7 @@ function Return_enUS()
8788
--[[Name]]
8889
["tabmenu_Main"] = "GM",
8990
--[[Tooltips]]
90-
["tt_MainButton"] = "Toggle TrinityAdmins Mainframe.",
91+
["tt_MainButton"] = "Toggle AzerothCoreAdmin Mainframe.",
9192
["tt_DisplayAccountLevel"] = "Display your account level",
9293
["tt_GMOnButton"] = "Activate your GM-mode.",
9394
["tt_GMOffButton"] = "Deactivate your GM-mode.",
@@ -599,7 +600,7 @@ function Return_enUS()
599600

600601
--[[Log Tab]]
601602
["tabmenu_log"] = "LOG",
602-
["tt_LogButton"] = "Show the log of all actions done with TrinityAdmin.",
603+
["tt_LogButton"] = "Show the log of all actions done with AzerothCoreAdmin.",
603604
--[[Tooltips]]
604605
--[[Control Labels]]
605606
--[[Other]]

Locales/strings.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
function ReturnStrings_enUS()
1919
return {
20-
["ma_GmatchRevision"] = "AzerothCoreAdmin rev. (%S*)",
20+
["ma_GmatchRevision"] = "AzerothCore rev. (%S*)",
2121
["ma_GmatchGPS"] = "X: (.*) Y: (.*) Z",
2222
["ma_GmatchItem"] = "%|cffffffff%|Hitem:(%d+).*%[(.*)%]%|h%|r",
2323
["ma_GmatchQuest"] = ".-(%d+).*%[(.*)%]%|h%|r",
@@ -34,7 +34,7 @@ function ReturnStrings_enUS()
3434
["ma_GmatchTickets"] = ".+Ticket.-:(.*)Created by.-:|cff00ccff (.*)|r.+Created.-:(.*)Last change.-:(.*)",
3535
["ma_GmatchAccountInfo"] = "Player(.*) %(guid: (%d+)%) Account: (.*) %(id: (%d+)%) Email: (.*) GMLevel: (%d+) Last IP: (.*) Last login: (.*) Latency: (%d+)ms",
3636
["ma_GmatchAccountInfo2"] = "Race: (.*) Class: (.*) Played time: (.*) Level: (%d+) Money: (.*)",
37-
["ma_GmatchOnlinePlayers"] = "Online players: (%d+) %(max: (%d+)%)",
37+
["ma_GmatchOnlinePlayers"] = "Connected players: (%d+). Characters in world: (%d+).",
3838
["ma_GmatchUptime"] = "Server uptime: (.*)",
3939
["ma_GmatchActiveConnections"] = "Active connections.*",
4040
["ma_GmatchWho"] = "%-%[(.*)%]%[(.*)%]%[(.*)%]%[(.*)%]%[(.*)%]%[(.*)%]%[(.*)%]-",

0 commit comments

Comments
 (0)