Skip to content

Commit 065a5f1

Browse files
committed
fix: add notifications to commands
1 parent 4351fcb commit 065a5f1

File tree

11 files changed

+114
-43
lines changed

11 files changed

+114
-43
lines changed

locales/cs.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
"notify": {
2626
"carjack_failed": "Krádež auta se nezdařila!",
2727
"failed_lockedpick": "Nedaří se vám najít klíče a jste zklamaní.",
28-
"fpid": "Vyplňte ID hráče a SPZ",
2928
"gave_keys": "Předáš klíče.",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "Dostanete klíčky od vozidla!",
3131
"no_keys": "Od tohoto vozidla nemáte klíče.",
3232
"not_near": "V blízkosti není nikdo, komu by bylo možné předat klíče",
3333
"vehicle_locked": "Vozidlo je zamčené!",
3434
"vehicle_lockedpick": "Podařilo se ti otevřít zámek dveří!",
35-
"vehicle_unlocked": "Vozidlo odemčeno!"
35+
"vehicle_unlocked": "Vozidlo odemčeno!",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Pokus o krádež auta...",
3942
"searching_keys": "Hledání klíčů od auta...",
4043
"takekeys": "Odebírání klíčů z těla..."
4144
}
42-
}
45+
}

locales/de.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
"notify": {
2626
"carjack_failed": "Knacken des Autos ist fehlgeschlagen!",
2727
"failed_lockedpick": "Du kannst keine Schlüssel finden und bist frustriert.",
28-
"fpid": "Gebe die Bürger-ID und das Kennzeichen an.",
2928
"gave_keys": "Du gibst die Schlüssel ab.",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "Du erhälst die Schlüssel für das Fahrzeug!",
3131
"no_keys": "Du hast keine Schlüssel für das Fahrzeug!",
3232
"not_near": "Es ist niemand in der Nähe, der den Schlüssel bekommen könnte!",
3333
"vehicle_locked": "Fahrzeug verriegelt!",
3434
"vehicle_lockedpick": "Du hast es geschafft, das Türschloss zu knacken!",
35-
"vehicle_unlocked": "Fahrzeug entriegelt."
35+
"vehicle_unlocked": "Fahrzeug entriegelt.",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Versuchter Autodiebstahl...",
3942
"searching_keys": "Suche nach Fahrzeugschlüssel...",
4043
"takekeys": "Fahrzeugschlüssel abnehmen..."
4144
}
42-
}
45+
}

locales/en.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
"notify": {
2626
"carjack_failed": "Carjacking failed!",
2727
"failed_lockedpick": "You fail to find the keys and get frustrated.",
28-
"fpid": "Fill out the player ID and Plate arguments",
2928
"gave_keys": "You hand over the keys.",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "You get keys to the vehicle!",
3131
"no_keys": "You don't have keys to this vehicle.",
3232
"not_near": "There is nobody nearby to hand keys to",
3333
"vehicle_locked": "Vehicle locked!",
3434
"vehicle_lockedpick": "You managed to pick the door lock open!",
35-
"vehicle_unlocked": "Vehicle unlocked!"
35+
"vehicle_unlocked": "Vehicle unlocked!",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Attempting Carjacking...",
3942
"searching_keys": "Searching for the car keys...",
4043
"takekeys": "Taking keys from body..."
4144
}
42-
}
45+
}

locales/es.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
"notify": {
2626
"carjack_failed": "¡Robo de carro falló!",
2727
"failed_lockedpick": "No logras encontrar las llaves y te frustras",
28-
"fpid": "Llena los argumentos de ID y placa del jugador",
2928
"gave_keys": "Has entregado las llaves",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "Has recibido las llaves del vehículo",
3131
"no_keys": "No tienes las llaves de este vehículo",
3232
"not_near": "No hay nadie cerca a quién darle las llaves",
3333
"vehicle_locked": "Vehículo cerrado",
3434
"vehicle_lockedpick": "Lograste abrir la cerradura",
35-
"vehicle_unlocked": "Vehículo abierto"
35+
"vehicle_unlocked": "Vehículo abierto",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Intentando robar carro...",
3942
"searching_keys": "Buscando las llaves del carro...",
4043
"takekeys": "Obteniendo las llaves del cuerpo..."
4144
}
42-
}
45+
}

locales/et.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
"notify": {
2626
"carjack_failed": "Autovargamine ebaõnnestus!",
2727
"failed_lockedpick": "Te ei leia võtmeid ja olete pettunud.",
28-
"fpid": "Täitke mängija ID ja plaadi argumendid",
2928
"gave_keys": "Annad võtmed üle.",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "Saate auto võtmed!",
3131
"no_keys": "Teil pole selle sõiduki võtmeid.",
3232
"not_near": "Läheduses pole kedagi, kellele võtmed kätte anda",
3333
"vehicle_locked": "Sõiduk lukus!",
3434
"vehicle_lockedpick": "Sul õnnestus ukselukk lahti keerata!",
35-
"vehicle_unlocked": "Sõiduk avatud!"
35+
"vehicle_unlocked": "Sõiduk avatud!",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Autovarguse katse...",
3942
"searching_keys": "Autovõtmete otsimine...",
4043
"takekeys": "Võtmete kehast võtmine..."
4144
}
42-
}
45+
}

locales/fr.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
"notify": {
2626
"carjack_failed": "Le détournement de voiture a échoué",
2727
"failed_lockedpick": "Vous n'avez pas réussi à ouvrir le véhicule et vous êtes frustré.",
28-
"fpid": "Remplissez les arguments ID et plaque.",
2928
"gave_keys": "Vous donnez les clés.",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "Vous obtenez les clés du véhicule!",
3131
"no_keys": "Vous n'avez pas de clés de ce véhicule.",
3232
"not_near": "Il n'y a personne à proximité.",
3333
"vehicle_locked": "Véhicule verrouillé!",
3434
"vehicle_lockedpick": "Vous avez réussi à ouvrir le véhicule!",
35-
"vehicle_unlocked": "Véhicule déverrouillé!"
35+
"vehicle_unlocked": "Véhicule déverrouillé!",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Tentative de vol de carjack..",
3942
"searching_keys": "Cherche les clés du véhicule..",
4043
"takekeys": "Prend les clés du corps.."
4144
}
42-
}
45+
}

locales/nl.json

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"addcom": {
3+
"addkeys": "Voegt sleutels aan een auto toe voor iemand.",
4+
"addkeys_id": "id",
5+
"addkeys_id_help": "Speler ID",
6+
"addkeys_plate": "plate",
7+
"addkeys_plate_help": "Kenteken",
8+
"givekeys": "Geef sleutels aan iemand. Als er geen ID wordt gegeven, worden de sleutels aan iemand dichtbij of iedereen in de auto gegeven.",
9+
"givekeys_id": "id",
10+
"givekeys_id_help": "Speler ID",
11+
"givekeys_plate": "plate",
12+
"givekeys_plate_help": "Kenteken",
13+
"remove_keys": "Verwijder sleutels naar een auto voor iemand.",
14+
"remove_keys_id": "id",
15+
"remove_keys_id_help": "Speler ID",
16+
"remove_keys_plate": "plate",
17+
"remove_keys_plate_help": "Kenteken"
18+
},
19+
"info": {
20+
"engine": "Zet motor aan/uit",
21+
"search_keys": "~g~[H]~w~ - Zoek Sleutels",
22+
"toggle_locks": "Zet auto op slot of haal hem van het slot af",
23+
"vehicle_theft": "Voertuigdiefstal bezig. Type: "
24+
},
25+
"notify": {
26+
"carjack_failed": "Voertuigdiefstal mislukt!",
27+
"failed_lockedpick": "Je kon de sleutels niet vinden en raakt gefrustreerd.",
28+
"gave_keys": "Je hebt de sleutels overgedragen.",
29+
"added_keys": "Je hebt een kopie van de sleutels voor het voertuig met kenteken %s gegeven aan speler %s!",
30+
"keys_taken": "Je kreeg de sleutels van het voertuig!",
31+
"no_keys": "Je hebt de sleutels van dit voertuig niet.",
32+
"not_near": "Er is niemand in de buurt om sleutels aan te geven",
33+
"vehicle_locked": "Voertuig op slot gezet!",
34+
"vehicle_lockedpick": "Je hebt de deur open gebroken!",
35+
"vehicle_unlocked": "Voertuig van het slot gehaald!",
36+
"removed_keys": "De sleutels voor het voertuig met kenteken %s voor speler %s zijn afgenomen!",
37+
"removed_keys_player": "De sleutels voor het voertuig met kenteken %s zijn van je afgenomen!",
38+
"player_offline": "Deze speler is niet online!"
39+
},
40+
"progress": {
41+
"attempting_carjack": "Voertuig Stelen...",
42+
"searching_keys": "Sleutels Zoeken...",
43+
"takekeys": "Sleutels van lichaam af halen..."
44+
}
45+
}

locales/pt.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
"notify": {
2626
"carjack_failed": "Falha no assalto ao veículo!",
2727
"failed_lockedpick": "Falhas em encontrar as chaves e ficas frustrado.",
28-
"fpid": "Preenche os argumentos do ID do jogador e da placa",
2928
"gave_keys": "Entregaste as chaves.",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "Recebeste as chaves do veículo!",
3131
"no_keys": "Não tens as chaves deste veículo.",
3232
"not_near": "Não há ninguém por perto para entregar as chaves",
3333
"vehicle_locked": "Veículo trancado!",
3434
"vehicle_lockedpick": "Conseguiste abrir a fechadura da porta!",
35-
"vehicle_unlocked": "Veículo destrancado!"
35+
"vehicle_unlocked": "Veículo destrancado!",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Tentativa de assalto ao veículo...",
3942
"searching_keys": "Procurando pelas chaves do carro...",
4043
"takekeys": "Tirando as chaves do corpo..."
4144
}
42-
}
45+
}

locales/ro.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
"notify": {
2626
"carjack_failed": "Furtul de mașină a eșuat",
2727
"failed_lockedpick": "Nu ai putut clona cheile masinii si te stresezi.",
28-
"fpid": "Trebuie sa introduci ID-ul jucatorului si numarul de inmatriculare",
2928
"gave_keys": "Ai dat cheile vehiculului.",
29+
"added_keys": "You gave a copy of the keys to vehicle %s to player %s!",
3030
"keys_taken": "Ai primit cheile vehiculului!",
3131
"no_keys": "Nu ai cheile acestui vehicul.",
3232
"not_near": "Nu este nimeni langa tine sa-i dai cheile vehiculului",
3333
"vehicle_locked": "Vehicul blocat - Alarma activa!",
3434
"vehicle_lockedpick": "Felicitari, ai reusit sa spargi incuietoarea!",
35-
"vehicle_unlocked": "Vehicul deblocat - Alarma inactiva!"
35+
"vehicle_unlocked": "Vehicul deblocat - Alarma inactiva!",
36+
"removed_keys": "The keys to plate %s for player %s have been removed!",
37+
"removed_keys_player": "Your keys to plate %s have been removed!",
38+
"player_offline": "This player is not online!"
3639
},
3740
"progress": {
3841
"attempting_carjack": "Incerci sa fur vehiculul...",

server/commands.lua

+21-19
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ lib.addCommand('givekeys', {
1616
},
1717
restricted = false,
1818
}, function (source, args)
19-
TriggerClientEvent('qb-vehiclekeys:client:GiveKeys', source, args[locale('addcom.givekeys_id')], args[locale('addcom.givekeys_plate')])
19+
local id = args[locale('addcom.givekeys_id')]
20+
if id and not exports.qbx_core:GetPlayer(id) then
21+
exports.qbx_core:Notify(source, locale('notify.player_offline'))
22+
return
23+
end
24+
25+
TriggerClientEvent('qb-vehiclekeys:client:GiveKeys', source, id, args[locale('addcom.givekeys_plate')])
2026
end)
2127

2228
lib.addCommand('addkeys', {
@@ -25,26 +31,24 @@ lib.addCommand('addkeys', {
2531
{
2632
name = locale('addcom.addkeys_id'),
2733
type = 'playerId',
28-
help = locale('addcom.addkeys_id_help'),
29-
optional = true
34+
help = locale('addcom.addkeys_id_help')
3035
},
3136
{
3237
name = locale('addcom.addkeys_plate'),
3338
type = 'string',
34-
help = locale('addcom.addkeys_plate_help'),
35-
optional = true
39+
help = locale('addcom.addkeys_plate_help')
3640
},
3741
},
3842
restricted = 'group.admin',
3943
}, function (source, args)
4044
local id = args[locale('addcom.addkeys_id')]
4145
local plate = args[locale('addcom.addkeys_plate')]
42-
if not id or not plate then
43-
exports.qbx_core:Notify(source, locale('notify.fpid'))
44-
return
46+
local success = GiveKeys(id, plate)
47+
if success then
48+
exports.qbx_core:Notify(source, locale('notify.added_keys', plate, id))
49+
else
50+
exports.qbx_core:Notify(source, locale('notify.player_offline'))
4551
end
46-
47-
GiveKeys(id, plate)
4852
end)
4953

5054
lib.addCommand('removekeys', {
@@ -53,24 +57,22 @@ lib.addCommand('removekeys', {
5357
{
5458
name = locale('addcom.removekeys_id'),
5559
type = 'playerId',
56-
help = locale('addcom.remove_keys_id_help'),
57-
optional = true
60+
help = locale('addcom.remove_keys_id_help')
5861
},
5962
{
6063
name = locale('addcom.removekeys_plate'),
6164
type = 'string',
62-
help = locale('addcom.remove_keys_plate_help'),
63-
optional = true
65+
help = locale('addcom.remove_keys_plate_help')
6466
}
6567
},
6668
restricted = 'group.admin',
6769
}, function (source, args)
6870
local id = args[locale('addcom.removekeys_id')]
6971
local plate = args[locale('addcom.removekeys_plate')]
70-
if not id or not plate then
71-
exports.qbx_core:Notify(source, locale('notify.fpid'))
72-
return
72+
local success = RemoveKeys(id, plate)
73+
if success then
74+
exports.qbx_core:Notify(source, locale('notify.removed_keys', plate, id))
75+
else
76+
exports.qbx_core:Notify(source, locale('notify.player_offline'))
7377
end
74-
75-
RemoveKeys(id, plate)
7678
end)

server/main.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ function GiveKeys(id, plate)
4545
if not vehicleList[plate] then vehicleList[plate] = {} end
4646
vehicleList[plate][player.PlayerData.citizenid] = true
4747

48-
exports.qbx_core:Notify(id, locale('notify.keys_taken'))
4948
TriggerClientEvent('qb-vehiclekeys:client:AddKeys', id, plate)
49+
exports.qbx_core:Notify(id, locale('notify.keys_taken'))
5050

5151
return true
5252
end

0 commit comments

Comments
 (0)