From ce216ad67631a8c35d31a3dc083dd818715d0d24 Mon Sep 17 00:00:00 2001 From: David Malchin Date: Sun, 21 Aug 2022 23:48:45 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8E=A8=20Rename=20locales=20and=20rem?= =?UTF-8?q?ove=20`notify`=20translation=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/events.lua | 6 +++--- locale/en.lua | 14 ++++++-------- locale/ro.lua | 17 +++++++---------- server/commands.lua | 4 ++-- server/events.lua | 4 ++-- server/exports.lua | 2 +- server/player.lua | 4 ++-- 7 files changed, 23 insertions(+), 28 deletions(-) diff --git a/client/events.lua b/client/events.lua index 145197a..b183bfb 100644 --- a/client/events.lua +++ b/client/events.lua @@ -37,7 +37,7 @@ RegisterNetEvent('QBCore:Command:GoToMarker', function() local blipMarker = GetFirstBlipInfoId(8) if not DoesBlipExist(blipMarker) then - QBCore.Functions.Notify(Lang:t("notify.nowp"), "error", 5000) + QBCore.Functions.Notify(Lang:t("error.no_waypoint"), "error", 5000) return 'marker' end @@ -108,12 +108,12 @@ RegisterNetEvent('QBCore:Command:GoToMarker', function() -- If we can't find the coords, set the coords to the old ones. -- We don't unpack them before since they aren't in a loop and only called once. SetPedCoordsKeepVehicle(ped, oldCoords['x'], oldCoords['y'], oldCoords['z'] - 1.0) - QBCore.Functions.Notify(Lang:t("notify.ewtp"), "error", 5000) + QBCore.Functions.Notify(Lang:t("error.tp_error"), "error", 5000) end -- If Z coord was found, set coords in found coords. SetPedCoordsKeepVehicle(ped, x, y, groundZ) - QBCore.Functions.Notify(Lang:t("notify.tptw"), "success", 5000) + QBCore.Functions.Notify(Lang:t("success.teleported_waypoint"), "success", 5000) end) -- Vehicle Commands diff --git a/locale/en.lua b/locale/en.lua index 0191c9a..e2da6e6 100644 --- a/locale/en.lua +++ b/locale/en.lua @@ -14,16 +14,14 @@ local Translations = { not_whitelisted = 'You\'re not whitelisted for this server', server_already_open = 'The server is already open', server_already_closed = 'The server is already closed', - noperm = 'You don\'t have permissions for this..', + no_permission = 'You don\'t have permissions for this..', + no_waypoint = 'No Waypoint Set.', + tp_error = 'Error While Teleporting.', }, success = { server_opened = 'The server has been opened', server_closed = 'The server has been closed', - }, - notify = { - nowp = 'No Waypoint Set.', - ewtp = 'Error While Teleporting.', - tptw = 'Teleported To Waypoint.', + teleported_waypoint = 'Teleported To Waypoint.', }, comm ={ tp = 'TP To Player or Coords (Admin Only)', @@ -98,8 +96,8 @@ local Translations = { checking_ban = 'Hello %s. We are checking if you are banned.', join_server = 'Welcome %s to {Server Name}.', checking_whitelisted = 'Hello %s. We are checking your allowance.', - skick = 'You have been banned for cheating. Check our Discord for more information: %{discord}', - pdexp = 'You Have Been Kicked For Exploitation', + exploit_banned = 'You have been banned for cheating. Check our Discord for more information: %{discord}', + exploit_dropped = 'You Have Been Kicked For Exploitation', } } diff --git a/locale/ro.lua b/locale/ro.lua index 7186b03..1eb923f 100644 --- a/locale/ro.lua +++ b/locale/ro.lua @@ -15,15 +15,12 @@ local Translations = { duplicate_license = 'Duplicat de licenta RockStar detectata', no_valid_license = 'Nu s-a gasit nicio licenta valida RockStar', not_whitelisted = 'Nu ai statut de whitelist pe acest server', - noperm = 'Din pacate nu ai permisiunile necesare pentru asa ceva..', + no_permission = 'Din pacate nu ai permisiunile necesare pentru asa ceva..', + no_waypoint = 'Niciun punct de referinta setat.', + tp_error = 'A aparut o eroare la teleportare.', }, - success = {}, - notify = { - nowp = 'Niciun punct de referinta setat.', - ewtp = 'A aparut o eroare la teleportare.', - tptw = 'Ai fost teleportat la punctul de referinta.', - ops_open = 'Serverul este deja deschis publicului', - ops_closed = 'Serverul este inchis publicului', + success = { + teleported_waypoint = 'Ai fost teleportat la punctul de referinta.', }, comm ={ tp = 'TP catre un jucator sau catre anumite coordonate (Admin Only)', @@ -98,8 +95,8 @@ local Translations = { checking_ban = 'Salutari %s. Verificam daca ai primit ban la noi :)', join_server = 'Bun venit %s pe {Server Name}.', checking_whitelisted = 'Salutari %s. Iti facem o verificare scurta.', - skick = 'Ai fost banat pentru cheating. Informatii suplimentare pe serverul nostru de Discord: ', - pdexp = 'Ai primit KICK pentru ca ai incercat un exploit!', + exploit_banned = 'Ai fost banat pentru cheating. Informatii suplimentare pe serverul nostru de Discord: ', + exploit_dropped = 'Ai primit KICK pentru ca ai incercat un exploit!', } } diff --git a/server/commands.lua b/server/commands.lua index 4afc004..44240a5 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -157,7 +157,7 @@ QBCore.Commands.Add('openserver', Lang:t("comm.opserv"), {}, false, function(sou QBCore.Config.Server.Closed = false TriggerClientEvent('QBCore:Notify', source, Lang:t('success.server_opened'), 'success') else - QBCore.Functions.Kick(source, Lang:t("error.noperm"), nil, nil) + QBCore.Functions.Kick(source, Lang:t("error.no_permission"), nil, nil) end end, 'admin') @@ -177,7 +177,7 @@ QBCore.Commands.Add('closeserver', Lang:t("comm.cserv"), {{ name = Lang:t("comm. end TriggerClientEvent('QBCore:Notify', source, Lang:t('success.server_closed'), 'success') else - QBCore.Functions.Kick(source, Lang:t("error.noperm"), nil, nil) + QBCore.Functions.Kick(source, Lang:t("error.no_permission"), nil, nil) end end, 'admin') diff --git a/server/events.lua b/server/events.lua index 8493b65..9fedad9 100644 --- a/server/events.lua +++ b/server/events.lua @@ -87,7 +87,7 @@ RegisterNetEvent('QBCore:Server:CloseServer', function(reason) end end else - QBCore.Functions.Kick(src, Lang:t("error.noperm"), nil, nil) + QBCore.Functions.Kick(src, Lang:t("error.no_permission"), nil, nil) end end) @@ -96,7 +96,7 @@ RegisterNetEvent('QBCore:Server:OpenServer', function() if QBCore.Functions.HasPermission(src, 'admin') then QBCore.Config.Server.Closed = false else - QBCore.Functions.Kick(src, Lang:t("error.noperm"), nil, nil) + QBCore.Functions.Kick(src, Lang:t("error.no_permission"), nil, nil) end end) diff --git a/server/exports.lua b/server/exports.lua index f94f6a3..f080732 100644 --- a/server/exports.lua +++ b/server/exports.lua @@ -328,7 +328,7 @@ local function ExploitBan(playerId, origin) 2147483647, 'Anti Cheat' }) - DropPlayer(playerId, Lang:t('info.skick', {discord = QBCore.Config.Server.Discord})) + DropPlayer(playerId, Lang:t('info.exploit_banned', {discord = QBCore.Config.Server.Discord})) TriggerEvent("qb-log:server:CreateLog", "anticheat", "Anti-Cheat", "red", name .. " has been banned for exploiting " .. origin, true) end diff --git a/server/player.lua b/server/player.lua index f2e854b..f0defa5 100644 --- a/server/player.lua +++ b/server/player.lua @@ -23,7 +23,7 @@ function QBCore.Player.Login(source, citizenid, newData) end QBCore.Player.CheckPlayerData(source, PlayerData) else - DropPlayer(source, Lang:t("info.pdexp")) + DropPlayer(source, Lang:t("info.exploit_dropped")) TriggerEvent('qb-log:server:CreateLog', 'anticheat', 'Anti-Cheat', 'white', GetPlayerName(source) .. ' Has Been Dropped For Character Joining Exploit', false) end else @@ -553,7 +553,7 @@ function QBCore.Player.DeleteCharacter(source, citizenid) end end) else - DropPlayer(source, Lang:t("info.pdexp")) + DropPlayer(source, Lang:t("info.exploit_dropped")) TriggerEvent('qb-log:server:CreateLog', 'anticheat', 'Anti-Cheat', 'white', GetPlayerName(source) .. ' Has Been Dropped For Character Deletion Exploit', true) end end From 6513c55aa5089c16ace63b6932f63409be998192 Mon Sep 17 00:00:00 2001 From: David Malchin Date: Mon, 22 Aug 2022 03:46:52 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20Use=20tables=20in=20command?= =?UTF-8?q?=20locales?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/en.lua | 147 ++++++++++++++++++++++++-------------------- locale/ro.lua | 145 +++++++++++++++++++++++-------------------- server/commands.lua | 34 +++++----- 3 files changed, 179 insertions(+), 147 deletions(-) diff --git a/locale/en.lua b/locale/en.lua index e2da6e6..bb5d8c3 100644 --- a/locale/en.lua +++ b/locale/en.lua @@ -23,70 +23,6 @@ local Translations = { server_closed = 'The server has been closed', teleported_waypoint = 'Teleported To Waypoint.', }, - comm ={ - tp = 'TP To Player or Coords (Admin Only)', - tp_idx = 'id/x', - tp_idx_h = 'ID of player or X position', - tp_y = 'y', - tp_y_h = 'Y position', - tp_z = 'z', - tp_z_h = 'Z position', - tpm = 'TP To Marker (Admin Only)', - tglpvp = 'Toggle PVP on the server (Admin Only)', - addper = 'Give Player Permissions (God Only)', - addper_id = 'id', - addper_idh = 'ID of player', - addper_per = 'permission', - addper_perh = 'Permission level', - rper = 'Remove Players Permissions (God Only)', - rper_id = 'id', - rper_idh = 'ID of player', - rper_per = 'permission', - rper_perh = 'Permission level', - opserv = 'Open the server for everyone (Admin Only)', - cserv = 'Close the server for people without permissions (Admin Only)', - cserv_r = 'reason', - cserv_rh = 'Reason for closing it (optional)', - car = 'Spawn Vehicle (Admin Only)', - car_m = 'model', - car_mh = 'Model name of the vehicle', - dv = 'Delete Vehicle (Admin Only)', - gm = 'Give A Player Money (Admin Only)', - gm_id = 'id', - gm_idh = 'Player ID', - gm_mt = 'moneytype', - gm_mth = 'Type of money (cash, bank, crypto)', - gm_a = 'amount', - gm_ah = 'Amount of money', - sm = 'Set Players Money Amount (Admin Only)', - sm_id = 'id', - sm_idh = 'Player ID', - sm_mt = 'moneytype', - sm_mth = 'Type of money (cash, bank, crypto)', - sm_a = 'amount', - sm_ah = 'Amount of money', - job = 'Check Your Job', - sjob = 'Set A Players Job (Admin Only)', - sjob_id = 'id', - sjob_idh = 'Player ID', - sjob_j = 'job', - sjob_jh = 'Job name', - sjob_g = 'grade', - sjob_gh = 'Grade', - sg = 'Set A Players Gang (Admin Only)', - sg_id = 'id', - sg_idh = 'Player ID', - sg_g = 'gang', - sg_gh = 'Name of a gang', - sg_gr = 'grade', - sg_grh = 'Grade', - cinv = 'Clear Players Inventory (Admin Only)', - cinv_id = 'id', - cinv_idh = 'Player ID', - me = 'Show local message', - me_m = 'message', - me_mh = 'Message to respond with', - }, info = { received_paycheck = 'You received your paycheck of $%{value}', job_info = 'Job: %{value} | Grade: %{value2} | Duty: %{value3}', @@ -98,7 +34,88 @@ local Translations = { checking_whitelisted = 'Hello %s. We are checking your allowance.', exploit_banned = 'You have been banned for cheating. Check our Discord for more information: %{discord}', exploit_dropped = 'You Have Been Kicked For Exploitation', - } + }, + command = { + tp = { + help = 'TP To Player or Coords (Admin Only)', + params = { + x = { name = 'id/x', help = 'ID of player or X position'}, + y = { name = 'y', help = 'Y position'}, + z = { name = 'z', help = 'Z position'}, + }, + }, + tpm = { help = 'TP To Marker (Admin Only)' }, + togglepvp = { help = 'Toggle PVP on the server (Admin Only)' }, + addpermission = { + help = 'Give Player Permissions (God Only)', + params = { + id = { name = 'id', help = 'ID of player' }, + permission = { name = 'permission', help = 'Permission level' }, + }, + }, + removepermission = { + help = 'Remove Player Permissions (God Only)', + params = { + id = { name = 'id', help = 'ID of player' }, + permission = { name = 'permission', help = 'Permission level' }, + }, + }, + openserver = { help = 'Open the server for everyone (Admin Only)' }, + closeserver = { + help = 'Close the server for people without permissions (Admin Only)', + params = { + reason = { name = 'reason', help = 'Reason for closing (optional)' }, + }, + }, + car = { + help = 'Spawn Vehicle (Admin Only)', + params = { + model = { name = 'model', help = 'Model name of the vehicle' }, + }, + }, + dv = { help = 'Delete Vehicle (Admin Only)' }, + givemoney = { + help = 'Give A Player Money (Admin Only)', + params = { + id = { name = 'id', help = 'Player ID' }, + moneytype = { name = 'moneytype', help = 'Type of money (cash, bank, crypto)' }, + amount = { name = 'amount', help = 'Amount of money' }, + }, + }, + setmoney = { + help = 'Set Players Money Amount (Admin Only)', + params = { + id = { name = 'id', help = 'Player ID' }, + moneytype = { name = 'moneytype', help = 'Type of money (cash, bank, crypto)' }, + amount = { name = 'amount', help = 'Amount of money' }, + }, + }, + job = { help = 'Check Your Job' }, + setjob = { + help = 'Set A Players Job (Admin Only)', + params = { + id = { name = 'id', help = 'Player ID' }, + job = { name = 'job', help = 'Job name' }, + grade = { name = 'grade', help = 'Job grade' }, + }, + }, + gang = { help = 'Check Your Gang' }, + setgang = { + help = 'Set A Players Gang (Admin Only)', + params = { + id = { name = 'id', help = 'Player ID' }, + gang = { name = 'gang', help = 'Gang name' }, + grade = { name = 'grade', help = 'Gang grade' }, + }, + }, + ooc = { help = 'OOC Chat Message' }, + me = { + help = 'Show local message', + params = { + message = { name = 'message', help = 'Message to send' } + }, + }, + }, } Lang = Locale:new({ diff --git a/locale/ro.lua b/locale/ro.lua index 1eb923f..162282f 100644 --- a/locale/ro.lua +++ b/locale/ro.lua @@ -22,70 +22,6 @@ local Translations = { success = { teleported_waypoint = 'Ai fost teleportat la punctul de referinta.', }, - comm ={ - tp = 'TP catre un jucator sau catre anumite coordonate (Admin Only)', - tp_idx = 'ID/X', - tp_idx_h = 'ID-ul jucatorului sau coordonata X', - tp_y = 'Y', - tp_y_h = 'Coordonata Y', - tp_z = 'Z', - tp_z_h = 'Coordonata Z', - tpm = 'TP la punctul de referinta de pe harta (Admin Only)', - tglpvp = 'Activeaza/Dezactiveaza PVP pe server (Admin Only)', - addper = 'Dai permisiuni speciale unui jucator (God Only)', - addper_id = 'ID', - addper_idh = 'ID-ul jucatorului', - addper_per = 'Permisiuni', - addper_perh = 'Permisiunile pe care vrei sa le dau (admin/moderator)', - rper = 'Stergi permisiunile speciale ale unui jucator (God Only)', - rper_id = 'ID', - rper_idh = 'ID-ul jucatorului', - rper_per = 'Permisiuni', - rper_perh = 'Nivelul de permisiuni pe care vrei sa le stergi', - opserv = 'Deschide serverul pentru publicul larg (Admin Only)', - cserv = 'Inchide serverul pentru publicul larg (Admin Only)', - cserv_r = 'Motivul', - cserv_rh = 'Motivul pentru care serverul este inchis publicului larg (optional)', - car = 'Spawneaza un vehicul (Admin Only)', - car_m = 'Model', - car_mh = 'Modelul vehiculului dorit, Ex: intruder', - dv = 'Stergi un vehicul (Admin Only)', - gm = 'Dai o suma de bani unui jucator (Admin Only)', - gm_id = 'ID', - gm_idh = 'ID-ul jucatorului, Ex: 342', - gm_mt = 'Tipul banilor', - gm_mth = 'Aici avem 3 optiuni (cash, bank, crypto)', - gm_a = 'Suma', - gm_ah = 'Suma de bani pe care vrei sa o dai, Ex: 5000', - sm = 'Setezi o suma de bani pentru un jucator anume (Admin Only)', - sm_id = 'ID', - sm_idh = 'ID-ul Jucatorului', - sm_mt = 'tipul de bani', - sm_mth = 'Tipul de bani pe care vrei sa-l setezi jucatorului (cash, bank, crypto)', - sm_a = 'Suma', - sm_ah = 'Suma de bani pe care vrei sa o dai/setezi', - job = 'Iti verifici job-ul, in cazul in care ai uitat :)', - sjob = 'Setezi un job pentru un cetatean (Admin Only)', - sjob_id = 'ID', - sjob_idh = 'ID-ul Jucatorului', - sjob_j = 'job', - sjob_jh = 'Numele jobului, asa cum este definit in config.', - sjob_g = 'Functia', - sjob_gh = 'Functia este de tipul 1,2,3,4 etc.', - sg = 'Setezi o gasca/mafie pentru un jucator (Admin Only)', - sg_id = 'ID', - sg_idh = 'ID-ul Jucatorului', - sg_g = 'gasca/mafie', - sg_gh = 'Numele mafiei sau a gasti pe care vrei sa o setezi', - sg_gr = 'Functia', - sg_grh = 'Functia este de tipul 1,2,3,4 etc.', - cinv = 'Golesti inventarul unui jucator (Admin Only)', - cinv_id = 'ID', - cinv_idh = 'ID-ul Jucatorului', - me = 'Mesaj local/Indica o actiune sau afectiune', - me_m = 'mesaj', - me_mh = 'Efectiv mesajul pe care vrei sa-l afisezi', - }, info = { received_paycheck = 'Ai primit salariul in valoare de $%{value}', job_info = 'Job: %{value} | Functie: %{value2} | In tura: %{value3}', @@ -97,7 +33,86 @@ local Translations = { checking_whitelisted = 'Salutari %s. Iti facem o verificare scurta.', exploit_banned = 'Ai fost banat pentru cheating. Informatii suplimentare pe serverul nostru de Discord: ', exploit_dropped = 'Ai primit KICK pentru ca ai incercat un exploit!', - } + }, + command = { + tp = { + help = 'TP catre un jucator sau catre anumite coordonate (Admin Only)', + params = { + x = { name = 'ID/X', help = 'ID-ul jucatorului sau coordonata X'}, + y = { name = 'Y', help = 'Coordonata Y'}, + z = { name = 'Z', help = 'Coordonata Z'}, + }, + }, + tpm = { help = 'TP la punctul de referinta de pe harta (Admin Only)' }, + togglepvp = { help = 'Activeaza/Dezactiveaza PVP pe server (Admin Only)' }, + addpermission = { + help = 'Dai permisiuni speciale unui jucator (God Only)', + params = { + id = { name = 'ID', help = 'ID-ul jucatorului' }, + permission = { name = 'Permisiuni', help = 'Permisiunile pe care vrei sa le dau (admin/moderator)' }, + }, + }, + removepermission = { + help = 'Stergi permisiunile speciale ale unui jucator (God Only)', + params = { + id = { name = 'ID', help = 'ID-ul jucatorului' }, + permission = { name = 'Permisiuni', help = 'Nivelul de permisiuni pe care vrei sa le stergi' }, + }, + }, + openserver = { help = 'Deschide serverul pentru publicul larg (Admin Only)' }, + closeserver = { + help = 'Inchide serverul pentru publicul larg (Admin Only)', + params = { + reason = { name = 'Motivul', help = 'Motivul pentru care serverul este inchis publicului larg (optional)' }, + }, + }, + car = { + help = 'Spawneaza un vehicul (Admin Only)', + params = { + model = { name = 'Model', help = 'Modelul vehiculului dorit, Ex: intruder' }, + }, + }, + dv = { help = 'Stergi un vehicul (Admin Only)' }, + givemoney = { + help = 'Dai o suma de bani unui jucator (Admin Only)', + params = { + id = { name = 'ID', help = 'ID-ul jucatorului, Ex: 342' }, + moneytype = { name = 'Tipul banilor', help = 'Aici avem 3 optiuni (cash, bank, crypto)' }, + amount = { name = 'Suma', help = 'Suma de bani pe care vrei sa o dai, Ex: 5000' }, + }, + }, + setmoney = { + help = 'Setezi o suma de bani pentru un jucator anume (Admin Only)', + params = { + id = { name = 'ID', help = 'ID-ul Jucatorului' }, + moneytype = { name = 'tipul de bani', help = 'Tipul de bani pe care vrei sa-l setezi jucatorului (cash, bank, crypto)' }, + amount = { name = 'Suma', help = 'Suma de bani pe care vrei sa o dai/setezi' }, + }, + }, + job = { help = 'Iti verifici job-ul, in cazul in care ai uitat :)' }, + setjob = { + help = 'Setezi un job pentru un cetatean (Admin Only)', + params = { + id = { name = 'ID', help = 'ID-ul Jucatorului' }, + job = { name = 'job', help = 'Numele jobului, asa cum este definit in config.' }, + grade = { name = 'Functia', help = 'Functia este de tipul 1,2,3,4 etc.' }, + }, + }, + setgang = { + help = 'Setezi o gasca/mafie pentru un jucator (Admin Only)', + params = { + id = { name = 'ID', help = 'ID-ul Jucatorului' }, + gang = { name = 'gasca/mafie', help = 'Numele mafiei sau a gasti pe care vrei sa o setezi' }, + grade = { name = 'Functia', help = 'Functia este de tipul 1,2,3,4 etc.' }, + }, + }, + me = { + help = 'Mesaj local/Indica o actiune sau afectiune', + params = { + message = { name = 'mesaj', help = 'Efectiv mesajul pe care vrei sa-l afisezi' } + }, + }, + }, } Lang = Locale:new({ diff --git a/server/commands.lua b/server/commands.lua index 44240a5..e240da7 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -81,7 +81,7 @@ function QBCore.Commands.Refresh(source) end -- Teleport -QBCore.Commands.Add('tp', Lang:t("comm.tp"), { { name = Lang:t("comm.tp_idx"), help = Lang:t("comm.tp_idx_h") }, { name = Lang:t("comm.tp_y"), help = Lang:t("comm.tp_y_h") }, { name = Lang:t("comm.tp_z"), help = Lang:t("comm.tp_z_h") } }, false, function(source, args) +QBCore.Commands.Add('tp', Lang:t("command.tp.help"), { { name = Lang:t("command.tp.params.x.name"), help = Lang:t("command.tp.params.x.help") }, { name = Lang:t("command.tp.params.y.name"), help = Lang:t("command.tp.params.y.help") }, { name = Lang:t("command.tp.params.z.name"), help = Lang:t("command.tp.params.z.help") } }, false, function(source, args) if args[1] and not args[2] and not args[3] then if tonumber(args[1]) then local target = GetPlayerPed(tonumber(args[1])) @@ -115,18 +115,18 @@ QBCore.Commands.Add('tp', Lang:t("comm.tp"), { { name = Lang:t("comm.tp_idx"), h end end, 'admin') -QBCore.Commands.Add('tpm', Lang:t("comm.tpm"), {}, false, function(source) +QBCore.Commands.Add('tpm', Lang:t("command.tpm.help"), {}, false, function(source) TriggerClientEvent('QBCore:Command:GoToMarker', source) end, 'admin') -QBCore.Commands.Add('togglepvp', Lang:t("comm.tglpvp"), {}, false, function() +QBCore.Commands.Add('togglepvp', Lang:t("command.togglepvp.help"), {}, false, function() QBConfig.Server.PVP = not QBConfig.Server.PVP TriggerClientEvent('QBCore:Client:PvpHasToggled', -1, QBConfig.Server.PVP) end, 'admin') -- Permissions -QBCore.Commands.Add('addpermission', Lang:t("comm.addper"), { { name = Lang:t("comm.addper_id"), help = Lang:t("comm.addper_idh") }, { name = Lang:t("comm.addper_per"), help = Lang:t("comm.addper_perh") } }, true, function(source, args) +QBCore.Commands.Add('addpermission', Lang:t("command.addpermission.help"), { { name = Lang:t("command.addpermission.params.id.name"), help = Lang:t("command.addpermission.params.id.help") }, { name = Lang:t("command.addpermission.params.permission.name"), help = Lang:t("command.addpermission.params.permission.help") } }, true, function(source, args) local Player = QBCore.Functions.GetPlayer(tonumber(args[1])) local permission = tostring(args[2]):lower() if Player then @@ -136,7 +136,7 @@ QBCore.Commands.Add('addpermission', Lang:t("comm.addper"), { { name = Lang:t("c end end, 'god') -QBCore.Commands.Add('removepermission', Lang:t("comm.rper"), { { name = Lang:t("comm.rper_id"), help = Lang:t("comm.rper_idh") }, { name = Lang:t("comm.rper_per"), help = Lang:t("comm.rper_perh") } }, true, function(source, args) +QBCore.Commands.Add('removepermission', Lang:t("command.removepermission.help"), { { name = Lang:t("command.removepermission.params.id.name"), help = Lang:t("command.removepermission.params.id.help") }, { name = Lang:t("command.removepermission.params.permission.name"), help = Lang:t("command.removepermission.params.permission.help") } }, true, function(source, args) local Player = QBCore.Functions.GetPlayer(tonumber(args[1])) local permission = tostring(args[2]):lower() if Player then @@ -148,7 +148,7 @@ end, 'god') -- Open & Close Server -QBCore.Commands.Add('openserver', Lang:t("comm.opserv"), {}, false, function(source) +QBCore.Commands.Add('openserver', Lang:t("command.openserver.help"), {}, false, function(source) if not QBCore.Config.Server.Closed then TriggerClientEvent('QBCore:Notify', source, Lang:t('error.server_already_open'), 'error') return @@ -161,7 +161,7 @@ QBCore.Commands.Add('openserver', Lang:t("comm.opserv"), {}, false, function(sou end end, 'admin') -QBCore.Commands.Add('closeserver', Lang:t("comm.cserv"), {{ name = Lang:t("comm.cserv_r"), help = Lang:t("comm.cserv_rh")}}, false, function(source, args) +QBCore.Commands.Add('closeserver', Lang:t("command.closeserver.help"), {{ name = Lang:t("command.closeserver.params.reason.name"), help = Lang:t("command.closeserver.params.reason.help")}}, false, function(source, args) if QBCore.Config.Server.Closed then TriggerClientEvent('QBCore:Notify', source, Lang:t('error.server_already_closed'), 'error') return @@ -183,17 +183,17 @@ end, 'admin') -- Vehicle -QBCore.Commands.Add('car', Lang:t("comm.car"), {{ name = Lang:t("comm.car_m"), help = Lang:t("comm.car_mh") }}, true, function(source, args) +QBCore.Commands.Add('car', Lang:t("command.car.help"), {{ name = Lang:t("command.car.params.model.name"), help = Lang:t("command.car.params.model.help") }}, true, function(source, args) TriggerClientEvent('QBCore:Command:SpawnVehicle', source, args[1]) end, 'admin') -QBCore.Commands.Add('dv', Lang:t("comm.dv"), {}, false, function(source) +QBCore.Commands.Add('dv', Lang:t("command.dv.help"), {}, false, function(source) TriggerClientEvent('QBCore:Command:DeleteVehicle', source) end, 'admin') -- Money -QBCore.Commands.Add('givemoney', Lang:t("comm.gm"), { { name = Lang:t("comm.gm_id"), help = Lang:t("comm.gm_idh") }, { name = Lang:t("comm.gm_mt"), help = Lang:t("comm.gm_mth") }, { name = Lang:t("comm.gm_a"), help = Lang:t("comm.gm_ah") } }, true, function(source, args) +QBCore.Commands.Add('givemoney', Lang:t("command.givemoney.help"), { { name = Lang:t("command.givemoney.params.id.name"), help = Lang:t("command.givemoney.params.id.help") }, { name = Lang:t("command.givemoney.params.moneytype.name"), help = Lang:t("command.givemoney.params.moneytype.help") }, { name = Lang:t("command.givemoney.params.amount.name"), help = Lang:t("command.givemoney.params.amount.help") } }, true, function(source, args) local Player = QBCore.Functions.GetPlayer(tonumber(args[1])) if Player then Player.Functions.AddMoney(tostring(args[2]), tonumber(args[3])) @@ -202,7 +202,7 @@ QBCore.Commands.Add('givemoney', Lang:t("comm.gm"), { { name = Lang:t("comm.gm_i end end, 'admin') -QBCore.Commands.Add('setmoney', Lang:t("comm.sm"), { { name = Lang:t("comm.sm_id"), help = Lang:t("comm.sm_idh") }, { name = Lang:t("comm.sm_mt"), help = Lang:t("comm.sm_mth") }, { name = Lang:t("comm.sm_a"), help = Lang:t("comm.sm_ah") } }, true, function(source, args) +QBCore.Commands.Add('setmoney', Lang:t("command.setmoney.help"), { { name = Lang:t("command.setmoney.params.id.name"), help = Lang:t("command.setmoney.params.id.help") }, { name = Lang:t("command.setmoney.params.moneytype.name"), help = Lang:t("command.setmoney.params.moneytype.help") }, { name = Lang:t("command.setmoney.params.amount.name"), help = Lang:t("command.setmoney.params.amount.help") } }, true, function(source, args) local Player = QBCore.Functions.GetPlayer(tonumber(args[1])) if Player then Player.Functions.SetMoney(tostring(args[2]), tonumber(args[3])) @@ -213,12 +213,12 @@ end, 'admin') -- Job -QBCore.Commands.Add('job', Lang:t("comm.job"), {}, false, function(source) +QBCore.Commands.Add('job', Lang:t("command.job.help"), {}, false, function(source) local PlayerJob = QBCore.Functions.GetPlayer(source).PlayerData.job TriggerClientEvent('QBCore:Notify', source, Lang:t('info.job_info', {value = PlayerJob.label, value2 = PlayerJob.grade.name, value3 = PlayerJob.onduty})) end, 'user') -QBCore.Commands.Add('setjob', Lang:t("comm.sjob"), { { name = Lang:t("comm.sjob_id"), help = Lang:t("comm.sjob_idh") }, { name = Lang:t("comm.sjob_j"), help = Lang:t("comm.sjob_jh") }, { name = Lang:t("comm.sjob_g"), help = Lang:t("comm.sjob_gh") } }, true, function(source, args) +QBCore.Commands.Add('setjob', Lang:t("command.setjob.help"), { { name = Lang:t("command.setjob.params.id.name"), help = Lang:t("command.setjob.params.id.help") }, { name = Lang:t("command.setjob.params.job.name"), help = Lang:t("command.setjob.params.job.help") }, { name = Lang:t("command.setjob.params.grade.name"), help = Lang:t("command.setjob.params.grade.help") } }, true, function(source, args) local Player = QBCore.Functions.GetPlayer(tonumber(args[1])) if Player then Player.Functions.SetJob(tostring(args[2]), tonumber(args[3])) @@ -229,12 +229,12 @@ end, 'admin') -- Gang -QBCore.Commands.Add('gang', 'Check Your Gang', {}, false, function(source) +QBCore.Commands.Add('gang', Lang:t("command.gang.help"), {}, false, function(source) local PlayerGang = QBCore.Functions.GetPlayer(source).PlayerData.gang TriggerClientEvent('QBCore:Notify', source, Lang:t('info.gang_info', {value = PlayerGang.label, value2 = PlayerGang.grade.name})) end, 'user') -QBCore.Commands.Add('setgang', Lang:t("comm.sg"), { { name = Lang:t("comm.sg_id"), help = Lang:t("comm.sg_idh") }, { name = Lang:t("comm.sg_g"), help = Lang:t("comm.sg_gh") }, { name = Lang:t("comm.sg_gr"), help = Lang:t("comm.sg_grh") } }, true, function(source, args) +QBCore.Commands.Add('setgang', Lang:t("command.setgang.help"), { { name = Lang:t("command.setgang.params.id.name"), help = Lang:t("command.setgang.params.id.help") }, { name = Lang:t("command.setgang.params.gang.name"), help = Lang:t("command.setgang.params.gang.help") }, { name = Lang:t("command.setgang.params.grade.name"), help = Lang:t("command.setgang.params.grade.help") } }, true, function(source, args) local Player = QBCore.Functions.GetPlayer(tonumber(args[1])) if Player then Player.Functions.SetGang(tostring(args[2]), tonumber(args[3])) @@ -245,7 +245,7 @@ end, 'admin') -- Out of Character Chat -QBCore.Commands.Add('ooc', 'OOC Chat Message', {}, false, function(source, args) +QBCore.Commands.Add('ooc', Lang:t("command.ooc.help"), {}, false, function(source, args) local message = table.concat(args, ' ') local Players = QBCore.Functions.GetPlayers() local Player = QBCore.Functions.GetPlayer(source) @@ -278,7 +278,7 @@ end, 'user') -- Me command -QBCore.Commands.Add('me', Lang:t("comm.me"), {{name = Lang:t("comm.me_m"), help = Lang:t("comm.me_mh")}}, false, function(source, args) +QBCore.Commands.Add('me', Lang:t("command.me.help"), {{name = Lang:t("command.me.params.message.name"), help = Lang:t("command.me.params.message.help")}}, false, function(source, args) if #args < 1 then TriggerClientEvent('QBCore:Notify', source, Lang:t('error.missing_args2'), 'error') return end local ped = GetPlayerPed(source) local pCoords = GetEntityCoords(ped)