diff --git a/locale/de/ExpGamingAdmin.AdminLib.cfg b/locale/de/ExpGamingAdmin.AdminLib.cfg index 8a920bf9..299b094f 100644 --- a/locale/de/ExpGamingAdmin.AdminLib.cfg +++ b/locale/de/ExpGamingAdmin.AdminLib.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Admin-Befehle tooltip=Die mächtigsten Befehle sind hier zuhause. no-info-file=Die Informationsdatei wurde nicht gefunden. diff --git a/locale/en/ExpGamingAdmin.AdminLib.cfg b/locale/en/ExpGamingAdmin.AdminLib.cfg index 5d623521..f240bac1 100644 --- a/locale/en/ExpGamingAdmin.AdminLib.cfg +++ b/locale/en/ExpGamingAdmin.AdminLib.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Admin Commands tooltip=Admin commands make their home here no-info-file=No info file was found diff --git a/locale/fr/ExpGamingAdmin.AdminLib.cfg b/locale/fr/ExpGamingAdmin.AdminLib.cfg index c01ee135..f882fc1c 100644 --- a/locale/fr/ExpGamingAdmin.AdminLib.cfg +++ b/locale/fr/ExpGamingAdmin.AdminLib.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Commandes Admin tooltip=Des commandes très puissantes résident ici. no-info-file=Aucun fichier info trouvé diff --git a/locale/nl/ExpGamingAdmin.AdminLib.cfg b/locale/nl/ExpGamingAdmin.AdminLib.cfg index 2fa50fa6..ff47947a 100644 --- a/locale/nl/ExpGamingAdmin.AdminLib.cfg +++ b/locale/nl/ExpGamingAdmin.AdminLib.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Admin Commands tooltip=Admin Commands kan je hier vinden. no-info-file=Infobestand niet gevonden. diff --git a/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg b/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg index e996652f..679188c2 100644 --- a/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg +++ b/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Adminkommandon tooltip=Adminkommando gör dit hem här no-info-file=Ingen informationsfil kunde hittas diff --git a/modules/ExpGamingAdmin/AdminLib/locale/de.cfg b/modules/ExpGamingAdmin/AdminLib/locale/de.cfg index 8a920bf9..299b094f 100644 --- a/modules/ExpGamingAdmin/AdminLib/locale/de.cfg +++ b/modules/ExpGamingAdmin/AdminLib/locale/de.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Admin-Befehle tooltip=Die mächtigsten Befehle sind hier zuhause. no-info-file=Die Informationsdatei wurde nicht gefunden. diff --git a/modules/ExpGamingAdmin/AdminLib/locale/en.cfg b/modules/ExpGamingAdmin/AdminLib/locale/en.cfg index 5d623521..f240bac1 100644 --- a/modules/ExpGamingAdmin/AdminLib/locale/en.cfg +++ b/modules/ExpGamingAdmin/AdminLib/locale/en.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Admin Commands tooltip=Admin commands make their home here no-info-file=No info file was found diff --git a/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg b/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg index c01ee135..f882fc1c 100644 --- a/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg +++ b/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Commandes Admin tooltip=Des commandes très puissantes résident ici. no-info-file=Aucun fichier info trouvé diff --git a/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg b/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg index 2fa50fa6..ff47947a 100644 --- a/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg +++ b/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Admin Commands tooltip=Admin Commands kan je hier vinden. no-info-file=Infobestand niet gevonden. diff --git a/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg b/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg index e996652f..679188c2 100644 --- a/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg +++ b/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg @@ -1,4 +1,4 @@ -[ExpGamingAdmin@4-0-0] +[ExpGamingAdmin] name=Adminkommandon tooltip=Adminkommando gör dit hem här no-info-file=Ingen informationsfil kunde hittas diff --git a/modules/ExpGamingAdmin/Ban/control.lua b/modules/ExpGamingAdmin/Ban/control.lua index af027552..e9d73064 100644 --- a/modules/ExpGamingAdmin/Ban/control.lua +++ b/modules/ExpGamingAdmin/Ban/control.lua @@ -22,7 +22,7 @@ local ThisModule = { } -- Function Define -AdminGui.add_button('ban','utility/danger_icon',{'ExpGamingAdmin@4-0-0.tooltip-ban'},function(player,byPlayer) +AdminGui.add_button('ban','utility/danger_icon',{'ExpGamingAdmin.tooltip-ban'},function(player,byPlayer) Admin.open(byPlayer,player,'ban') end) diff --git a/modules/ExpGamingAdmin/Gui/control.lua b/modules/ExpGamingAdmin/Gui/control.lua index b001bb3a..f0fd1d00 100644 --- a/modules/ExpGamingAdmin/Gui/control.lua +++ b/modules/ExpGamingAdmin/Gui/control.lua @@ -19,7 +19,7 @@ local AdminGui = { else playerInfo = function(player,frame) frame.add{ type='label', - caption={'ExpGamingAdmin@4-0-0.no-info-file'} + caption={'ExpGamingAdmin.no-info-file'} } end end --code @@ -91,13 +91,13 @@ local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-admin-comman else get_player_info(selected,player_info_flow,true) end local rank = Ranking.get_rank(player) local _rank = Ranking.get_rank(selected) - if rank.power >= _rank.power then element.parent.warning.caption = {'ExpGamingAdmin@4-0-0.warning'} + if rank.power >= _rank.power then element.parent.warning.caption = {'ExpGamingAdmin.warning'} else element.parent.warning.caption = '' end end) local reason_input = Gui.inputs.add_text('reason-input-admin-commands',false,'Enter Reason',function(player,text,element) if string.len(text) < 20 or text == 'Enter Reason' then - element.parent.warning.caption = {'ExpGamingAdmin@4-0-0.short-reason'} + element.parent.warning.caption = {'ExpGamingAdmin.short-reason'} else element.parent.warning.caption = '' end @@ -115,15 +115,15 @@ end) local take_action = Gui.inputs.add{ type='button', name='admin-commands-take', - caption={'ExpGamingAdmin@4-0-0.take-action'} + caption={'ExpGamingAdmin.take-action'} }:on_event('click',function(event) local dropdowns = event.element.parent local rank = Ranking.get_rank(event.player_index) local _action= dropdowns.parent.action.caption ~= 'Select Action' and dropdowns.parent.action.caption or nil local _player = Game.get_player(dropdowns.parent.player.caption) - if not _player or not _action then dropdowns.warning.caption = {'ExpGamingAdmin@4-0-0.invalid'} return end + if not _player or not _action then dropdowns.warning.caption = {'ExpGamingAdmin.invalid'} return end local _rank = Ranking.get_rank(_player) - if rank.power >= _rank.power then dropdowns.warning.caption = {'ExpGamingAdmin@4-0-0.rank-high'} return end + if rank.power >= _rank.power then dropdowns.warning.caption = {'ExpGamingAdmin.rank-high'} return end local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text if (_action == 'Jail' or _action == 'Kick' or _action == 'Ban' or _action == 'Temp Ban') and (_reason == 'Enter Reason' or string.len(_reason) < 20) then return end Admin.take_action(_action,_player,event.player_index,_reason) @@ -133,7 +133,7 @@ end) Admin.center = Gui.center.add{ name='admin-commands', caption='utility/danger_icon', - tooltip={'ExpGamingAdmin@4-0-0.tooltip'}, + tooltip={'ExpGamingAdmin.tooltip'}, open=function(event,pre_select_player,pre_select_action) local _player = Game.get_player(pre_select_player) local player = Game.get_player(event) @@ -152,7 +152,7 @@ Admin.center = Gui.center.add{ player.opened=center_frame end, draw=function(frame,pre_select_player,pre_select_action) - frame.caption={'ExpGamingAdmin@4-0-0.name'} + frame.caption={'ExpGamingAdmin.name'} local frame = frame.add{ type='flow', direction='horizontal' @@ -170,7 +170,7 @@ Admin.center = Gui.center.add{ player_info_flow.style.width = 200 local label = dropdowns.add{ type='label', - caption={'ExpGamingAdmin@4-0-0.message'} + caption={'ExpGamingAdmin.message'} } label.style.single_line = false label.style.width = 200 diff --git a/modules/ExpGamingAdmin/Jail/control.lua b/modules/ExpGamingAdmin/Jail/control.lua index 71221d95..2594cc05 100644 --- a/modules/ExpGamingAdmin/Jail/control.lua +++ b/modules/ExpGamingAdmin/Jail/control.lua @@ -23,7 +23,7 @@ local ThisModule = { } -- Function Define -AdminGui.add_button('jail','utility/clock',{'ExpGamingAdmin@4-0-0.tooltip-jail'},function(player,byPlayer) +AdminGui.add_button('jail','utility/clock',{'ExpGamingAdmin.tooltip-jail'},function(player,byPlayer) Admin.open(byPlayer,player,'jail') end) diff --git a/modules/ExpGamingAdmin/Kick/control.lua b/modules/ExpGamingAdmin/Kick/control.lua index 1f0cc1e0..62d0615e 100644 --- a/modules/ExpGamingAdmin/Kick/control.lua +++ b/modules/ExpGamingAdmin/Kick/control.lua @@ -21,7 +21,7 @@ local ThisModule = { end } -- Function Define -AdminGui.add_button('kick','utility/warning_icon',{'ExpGamingAdmin@4-0-0.tooltip-kick'},function(player,byPlayer) +AdminGui.add_button('kick','utility/warning_icon',{'ExpGamingAdmin.tooltip-kick'},function(player,byPlayer) Admin.open(byPlayer,player,'kick') end) diff --git a/modules/ExpGamingAdmin/Reports/control.lua b/modules/ExpGamingAdmin/Reports/control.lua index 85eadec8..8d6affed 100644 --- a/modules/ExpGamingAdmin/Reports/control.lua +++ b/modules/ExpGamingAdmin/Reports/control.lua @@ -44,8 +44,8 @@ local function report_message(player,by_player,reason) local player, by_player_name = valid_players(player,by_player) if not player then return end if Admin.is_banned(player,true) == 'report' then return end - Ranking.print(low_rank,{'ExpGamingAdmin@4-0-0.low-print',player.name,reason},defines.textcolor.info,true) - Ranking.print(high_rank,{'ExpGamingAdmin@4-0-0.high-print',player.name,by_player_name,reason},defines.textcolor.med) + Ranking.print(low_rank,{'ExpGamingAdmin.low-print',player.name,reason},defines.textcolor.info,true) + Ranking.print(high_rank,{'ExpGamingAdmin.high-print',player.name,by_player_name,reason},defines.textcolor.med) if Sync then Sync.emit_embeded{ title='Player Report', color=Color.to_hex(defines.textcolor.med), diff --git a/modules/ExpGamingAdmin/Teleport/control.lua b/modules/ExpGamingAdmin/Teleport/control.lua index 30690d02..aa95c455 100644 --- a/modules/ExpGamingAdmin/Teleport/control.lua +++ b/modules/ExpGamingAdmin/Teleport/control.lua @@ -14,10 +14,10 @@ local module_verbose = false local ThisModule = {} -- Function Define -AdminGui.add_button('goto','utility/export_slot',{'ExpGamingAdmin@4-0-0.tooltip-go-to'},function(player,byPlayer) +AdminGui.add_button('goto','utility/export_slot',{'ExpGamingAdmin.tooltip-go-to'},function(player,byPlayer) Admin.go_to(player,byPlayer) end) -AdminGui.add_button('bring','utility/import_slot',{'ExpGamingAdmin@4-0-0.tooltip-bring'},function(player,byPlayer) +AdminGui.add_button('bring','utility/import_slot',{'ExpGamingAdmin.tooltip-bring'},function(player,byPlayer) Admin.bring(player,byPlayer) end) diff --git a/modules/ExpGamingAdmin/TempBan/control.lua b/modules/ExpGamingAdmin/TempBan/control.lua index 439f8c30..9158a02c 100644 --- a/modules/ExpGamingAdmin/TempBan/control.lua +++ b/modules/ExpGamingAdmin/TempBan/control.lua @@ -34,7 +34,7 @@ function Admin.temp_ban(player,by_player,reason) ['By:']='<>'..by_player_name, ['Reason:']=Admin.create_reason(reason,by_player_name) } end - game.print({'ExpGamingAdmin@4-0-0.temp-ban',player.name,by_player_name,reason},defines.textcolor.info) + game.print({'ExpGamingAdmin.temp-ban',player.name,by_player_name,reason},defines.textcolor.info) if Admin.move_inventory then Admin.move_inventory(player) end Ranking.meta.last_jail = player.name Server.interface(Ranking.give_rank,true,player,'Jail',by_player_name) diff --git a/modules/ExpGamingCommands/admin/src/clear.lua b/modules/ExpGamingCommands/admin/src/clear.lua index 29392ab1..000cd2bb 100644 --- a/modules/ExpGamingCommands/admin/src/clear.lua +++ b/modules/ExpGamingCommands/admin/src/clear.lua @@ -7,6 +7,6 @@ commands.add_command('clear-inv', 'Clears a player\'s invetory', { ['player'] = {true,'player-rank'} }, function(event,args) local player = args.player - if Admin.is_banned(player) then player_return({'ExpGamingAdmin@4-0-0.cant-report-ban',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end Admin.move_inventory(player) end) diff --git a/modules/ExpGamingCommands/admin/src/jail.lua b/modules/ExpGamingCommands/admin/src/jail.lua index 710dfebd..4b043257 100644 --- a/modules/ExpGamingCommands/admin/src/jail.lua +++ b/modules/ExpGamingCommands/admin/src/jail.lua @@ -11,7 +11,7 @@ commands.add_command('jail', 'Jails a player', { }, function(event,args) local player = args.player local reason = args.reason - if Ranking.get_rank(player):allowed('no-report') then player_return({'ExpGamingAdmin@4-0-0.cant-report',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end Admin.jail(player,event.player_index,reason) end) diff --git a/modules/ExpGamingCommands/admin/src/reports.lua b/modules/ExpGamingCommands/admin/src/reports.lua index 50a5ad47..e4e5aba7 100644 --- a/modules/ExpGamingCommands/admin/src/reports.lua +++ b/modules/ExpGamingCommands/admin/src/reports.lua @@ -12,10 +12,10 @@ commands.add_command('report', 'Reports a player', { local _player = Game.get_player(event) local player = args.player local reason = args.reason - if Admin.is_banned(player) then player_return({'ExpGamingAdmin@4-0-0.cant-report-ban',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') then player_return({'ExpGamingAdmin@4-0-0.cant-report',args.player}) return commands.error end - for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'ExpGamingAdmin@4-0-0.cant-report',args.player}) return commands.error end end - for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'ExpGamingAdmin@4-0-0.cant-report',args.player}) return commands.error end end + if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end + for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end end + for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end end Admin.report(player,event.player_index,reason) end) diff --git a/modules/ExpGamingCommands/admin/src/tempban.lua b/modules/ExpGamingCommands/admin/src/tempban.lua index 64d93427..79919bba 100644 --- a/modules/ExpGamingCommands/admin/src/tempban.lua +++ b/modules/ExpGamingCommands/admin/src/tempban.lua @@ -10,6 +10,6 @@ commands.add_command('temp-ban', 'Temporarily ban a player', { }, function(event,args) local player = args.player local reason = args.reason - if Admin.is_banned(player) then player_return({'ExpGamingAdmin@4-0-0.cant-report-ban',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end Admin.temp_ban(player,event.player_index,reason) end) \ No newline at end of file diff --git a/modules/ExpGamingCommands/admin/src/warnings.lua b/modules/ExpGamingCommands/admin/src/warnings.lua index 61375731..2e139f4e 100644 --- a/modules/ExpGamingCommands/admin/src/warnings.lua +++ b/modules/ExpGamingCommands/admin/src/warnings.lua @@ -11,8 +11,8 @@ commands.add_command('warn', 'Gives a player a warning', { }, function(event,args) local player = args.player local reason = args.reason - if Admin.is_banned(player) then player_return({'ExpGamingAdmin@4-0-0.cant-report-ban',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') then player_return({'ExpGamingAdmin@4-0-0.cant-report',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end Admin.give_warning(player,event.player_index,reason) end) @@ -23,6 +23,6 @@ commands.add_command('clear-warnings', 'Clears a player\'s warnings', { ['player'] = {true,'player'} }, function(event,args) local player = args.player - if Admin.is_banned(player) then player_return({'ExpGamingAdmin@4-0-0.cant-report-ban',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end Admin.clear_warings(player,event.player_index) end) \ No newline at end of file diff --git a/to convert/Addons/Guis/reports.lua b/to convert/Addons/Guis/reports.lua index 510a1e7e..969a9146 100644 --- a/to convert/Addons/Guis/reports.lua +++ b/to convert/Addons/Guis/reports.lua @@ -12,7 +12,7 @@ local confirm_report = Gui.inputs.add{ type='button', name='admin-report-confirm', caption='utility/spawn_flag', - tooltip={ExpGamingAdmin@4-0-0.name'} + tooltip={ExpGamingAdmin.name'} }:on_event('click',function(event) local parent = event.element.parent local player = Game.get_player(parent.player.caption) @@ -25,7 +25,7 @@ Admin.report_btn = Gui.inputs.add{ type='button', name='admin-report', caption='utility/spawn_flag', - tooltip={ExpGamingAdmin@4-0-0.name'} + tooltip={ExpGamingAdmin.name'} }:on_event('click',function(event) local parent = event.element.parent local player = Game.get_player(parent.children[1].name) @@ -37,7 +37,7 @@ Admin.report_btn = Gui.inputs.add{ name='report-gui' } _player.opened=frame - frame.caption={ExpGamingAdmin@4-0-0.name'} + frame.caption={ExpGamingAdmin.name'} frame.add{ type='textfield', name='reason'