Improved confiscate messages, closes #107

__resource.lua

@@ -30,3 +30,5 @@ client_scripts {
 	'config.lua',
 	'client/main.lua'
 }
+
+dependency 'es_extended'

client/main.lua

@@ -397,7 +397,7 @@ function OpenVehicleSpawnerMenu(station, partNum)
                 end)
 
               else
-                ESX.ShowNotification(_U('service_max') .. inServiceCount .. '/' .. maxInService)
+                ESX.ShowNotification(_U('service_max', inServiceCount, maxInService) .. inServiceCount .. '/' .. maxInService)
               end
 
             end, 'police')
@@ -774,17 +774,17 @@ function OpenBodySearchMenu(player)
     end
 
     table.insert(elements, {
-      label          = _U('confiscate_dirty') .. blackMoney,
+      label          = _U('confiscate_dirty', blackMoney),
       value          = 'black_money',
       itemType       = 'item_account',
       amount         = blackMoney
     })
 
-    table.insert(elements, {label = '--- Armes ---', value = nil})
+    table.insert(elements, {label = _U('guns_label'), value = nil})
 
     for i=1, #data.weapons, 1 do
       table.insert(elements, {
-        label          = _U('confiscate') .. ESX.GetWeaponLabel(data.weapons[i].name),
+        label          = _U('confiscate', ESX.GetWeaponLabel(data.weapons[i].name)),
         value          = data.weapons[i].name,
         itemType       = 'item_weapon',
         amount         = data.ammo,
@@ -796,7 +796,7 @@ function OpenBodySearchMenu(player)
     for i=1, #data.inventory, 1 do
       if data.inventory[i].count > 0 then
         table.insert(elements, {
-          label          = _U('confiscate_inv') .. data.inventory[i].count .. ' ' .. data.inventory[i].label,
+          label          = _U('confiscate_inv', data.inventory[i].count, data.inventory[i].label),
           value          = data.inventory[i].name,
           itemType       = 'item_standard',
           amount         = data.inventory[i].count,
@@ -892,9 +892,9 @@ function OpenFineCategoryMenu(player, category)
         menu.close()
 
         if Config.EnablePlayerManagement then
-          TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(player), 'society_police', _U('fine_total') .. label, amount)
+          TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(player), 'society_police', _U('fine_total', label), amount)
         else
-          TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(player), '', _U('fine_total') .. label, amount)
+          TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(player), '', _U('fine_total', label), amount)
         end
 
         ESX.SetTimeout(300, function()
@@ -986,12 +986,12 @@ function OpenVehicleInfosMenu(vehicleData)
 
     local elements = {}
 
-    table.insert(elements, {label = _U('plate') .. infos.plate, value = nil})
+    table.insert(elements, {label = _U('plate', infos.plate), value = nil})
 
     if infos.owner == nil then
       table.insert(elements, {label = _U('owner_unknown'), value = nil})
     else
-      table.insert(elements, {label = _U('owner') .. infos.owner, value = nil})
+      table.insert(elements, {label = _U('owner', infos.owner), value = nil})
     end
 
     ESX.UI.Menu.Open(
@@ -1059,7 +1059,7 @@ function OpenPutWeaponMenu()
     local weaponHash = GetHashKey(weaponList[i].name)
 
     if HasPedGotWeapon(playerPed,  weaponHash,  false) and weaponList[i].name ~= 'WEAPON_UNARMED' then
-      local ammo = GetAmmoInPedWeapon(playerPed, weaponHash)
+      --local ammo = GetAmmoInPedWeapon(playerPed, weaponHash)
       table.insert(elements, {label = weaponList[i].label, value = weaponList[i].name})
     end
 

locales/br.lua

@@ -22,7 +22,7 @@ Locales['br'] = {
   ['vehicle_out'] = 'Já existe um carro fora da garagem',
   ['vehicle_spawner'] = 'Pressione ~INPUT_CONTEXT~ para escolher um veículo',
   ['store_vehicle'] = 'Pressione ~INPUT_CONTEXT~ para guardar o veículo',
-  ['service_max'] = 'Maximo de oficiais em serviço : ',
+  ['service_max'] = 'maximo de oficiais em serviço: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'Interagir com o cidadão',
   ['vehicle_interaction'] = 'Interagir com o veículo',
@@ -63,24 +63,29 @@ Locales['br'] = {
   ['box'] = 'Caixa',
   ['cash'] = 'Caixa de dinheiro',
   -- ID Card Menu
-  ['name'] = 'Nome : ',
-  ['bac'] = 'bAC : ',
+  ['name'] = 'Nome: %s',
+  ['bac'] = 'BAC: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'Confiscar dinheiro sujo : $',
   ['guns_label'] = '--- Armas ---',
-  ['confiscate'] = 'Confiscar ',
   ['inventory_label'] = '--- Inventário ---',
-  ['confiscate_inv'] = 'Confiscar x',
-
+  ['confiscate'] = 'confiscar %s',
+  ['confiscate_inv'] = 'Confiscar %sx %s',
+  ['confiscate_dirty'] = 'Confiscar dinheiro sujo: <span style="color:red;">$%s</span>',
+  ['you_confiscated'] = 'you confiscated ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ were confiscated by ~y~%s~s~',
+  ['you_confiscated_account'] = 'you confiscated ~g~$%s~s~ (%s) from ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~$%s~s~ (%s) was confiscated by ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'you confiscated ~b~%s~s~ from ~b~%s~s~ with ~o~%s~s~ bullets',
+  ['got_confiscated_weapon'] = 'your ~b~%s~s~ with ~o~%s~s~ bullets was confiscated by ~y~%s~s~',
   ['traffic_offense'] = 'Infrações de transito',
   ['minor_offense'] = 'Infração leve',
   ['average_offense'] = 'Infração média',
   ['major_offense'] = 'Infração grave',
-  ['fine_total'] = 'Multa : ',
+  ['fine_total'] = 'multa: %s',
   -- Vehicle Info Menu
-  ['plate'] = 'Placa: ',
-  ['owner_unknown'] = 'Proprietário : Desconhecido',
-  ['owner'] = 'Proprietário : ',
+  ['plate'] = 'placa: %s',
+  ['owner_unknown'] = 'proprietário: Desconhecido',
+  ['owner'] = 'proprietário: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'Arsenal - Pegar arma',
   ['put_weapon_menu'] = 'Arsenal - Entregar arma',
@@ -97,12 +102,5 @@ Locales['br'] = {
   ['remove_prop'] = 'Pressione ~INPUT_CONTEXT~ para remover o objeto',
   ['map_blip'] = 'Departamento de Polícia',
   -- Notifications
-  ['from'] = '~s~ de ~b~',
-  ['you_have_confinv'] = 'Você confiscou ~y~x',
-  ['confinv'] = '~s~ confiscado de você ~y~x',
-  ['you_have_confdm'] = 'Você confiscou ~y~$',
-  ['confdm'] = '~s~ confiscado de você ~y~$',
-  ['you_have_confweapon'] = 'Você confiscou ~y~x1 ',
-  ['confweapon'] = '~s~ confiscado de você ~y~x1 ',
   ['alert_police'] = 'Alerta da Polícia',
 }

locales/de.lua

@@ -22,7 +22,7 @@ Locales['de'] = {
   ['vehicle_out'] = 'es ist bereits ein Fahrzeug draussen',
   ['vehicle_spawner'] = 'Drücke ~INPUT_CONTEXT~ um ein Fahrzeug zu holen',
   ['store_vehicle'] = 'Drücke ~INPUT_CONTEXT~ um das Fahrzeug zu parken',
-  ['service_max'] = 'Max Polizisten im Dienst : ',
+  ['service_max'] = 'max Polizisten im Dienst: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'Zivilistenaktionen',
   ['vehicle_interaction'] = 'Fahrzeuginteraktionen',
@@ -63,24 +63,29 @@ Locales['de'] = {
   ['box'] = 'Box',
   ['cash'] = 'Box mit Geld',
   -- ID Card Menu
-  ['name'] = 'name : ',
-  ['bac'] = 'bAC : ',
+  ['name'] = 'name: %s',
+  ['bac'] = 'BAC: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'Schwarzgeld konfesziert : $',
   ['guns_label'] = '--- Waffen ---',
-  ['confiscate'] = 'konfeszieren ',
   ['inventory_label'] = '--- Inventar ---',
-  ['confiscate_inv'] = 'konfeziere x',
-
+  ['confiscate'] = 'konfeszieren %s',
+  ['confiscate_inv'] = 'konfeziere %sx %s',
+  ['confiscate_dirty'] = 'schwarzgeld konfesziert: <span style="color:red;">$%s</span>',
+  ['you_confiscated'] = 'you confiscated ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ were confiscated by ~y~%s~s~',
+  ['you_confiscated_account'] = 'you confiscated ~g~$%s~s~ (%s) from ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~$%s~s~ (%s) was confiscated by ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'you confiscated ~b~%s~s~ from ~b~%s~s~ with ~o~%s~s~ bullets',
+  ['got_confiscated_weapon'] = 'your ~b~%s~s~ with ~o~%s~s~ bullets was confiscated by ~y~%s~s~',
   ['traffic_offense'] = 'Verkehrs vergehen',
   ['minor_offense'] = 'Geringes vergehen',
   ['average_offense'] = 'Normales vergehen',
   ['major_offense'] = 'Hohes vergehen',
-  ['fine_total'] = 'Strafe : ',
+  ['fine_total'] = 'strafe: %s',
   -- Vehicle Info Menu
-  ['plate'] = 'Plate: ',
-  ['owner_unknown'] = 'Besitzer : Unbekannt',
-  ['owner'] = 'Besitzer : ',
+  ['plate'] = 'plate: %s',
+  ['owner_unknown'] = 'besitzer: Unbekannt',
+  ['owner'] = 'besitzer: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'Waffenkammer - Waffen nehmen',
   ['put_weapon_menu'] = 'Waffenkammer - Waffen bringen',
@@ -97,12 +102,5 @@ Locales['de'] = {
   ['remove_prop'] = 'Drücke ~INPUT_CONTEXT~ um das Objekt zu entfernen',
   ['map_blip'] = 'Polizeistation',
   -- Notifications
-  ['from'] = '~s~ von ~b~',
-  ['you_have_confinv'] = 'du hast ~y~x konfesziert',
-  ['confinv'] = '~s~ hat von dir ~y~x konfesziert',
-  ['you_have_confdm'] = 'du hast ~y~$ konfesziert',
-  ['confdm'] = '~s~ hat von dir ~y~$ konfesziert',
-  ['you_have_confweapon'] = 'du hast ~y~x1 konfesziert',
-  ['confweapon'] = '~s~ hat von dir ~y~x1 konfesziert',
   ['alert_police'] = 'Polizei alamieren',
 }

locales/en.lua

@@ -22,7 +22,7 @@ Locales['en'] = {
   ['vehicle_out'] = 'there is already a car out of the garage',
   ['vehicle_spawner'] = 'press ~INPUT_CONTEXT~ to take out a vehicle',
   ['store_vehicle'] = 'press ~INPUT_CONTEXT~ to store the vehicle',
-  ['service_max'] = 'Max officers in service: ',
+  ['service_max'] = 'max officers in service: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'citizen Interaction',
   ['vehicle_interaction'] = 'vehicle Interaction',
@@ -56,31 +56,36 @@ Locales['en'] = {
   ['search_database_error_not_found'] = 'that ~y~registration number~s~ is ~r~not~s~ registered to an vehicle!',
   ['search_database_found'] = 'the vehicle is ~y~registered~s~ to ~b~%s~s~',
   -- Traffic interaction
-  ['traffic_interaction'] = 'Interaction Traffic',
+  ['traffic_interaction'] = 'interaction Traffic',
   ['cone'] = 'cone',
   ['barrier'] = 'barrier',
   ['spikestrips'] = 'spikestrips',
   ['box'] = 'box',
   ['cash'] = 'Box of cash',
   -- ID Card Menu
-  ['name'] = 'name : ',
-  ['bac'] = 'bAC : ',
+  ['name'] = 'name: %s',
+  ['bac'] = 'BAC: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'confiscate dirty money: $',
   ['guns_label'] = '--- Guns ---',
-  ['confiscate'] = 'confiscate ',
   ['inventory_label'] = '--- Inventory ---',
-  ['confiscate_inv'] = 'confiscate x',
-
+  ['confiscate'] = 'confiscate %s',
+  ['confiscate_inv'] = 'confiscate %sx %s',
+  ['confiscate_dirty'] = 'confiscate dirty money: <span style="color:red;">$%s</span>',
+  ['you_confiscated'] = 'you confiscated ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ were confiscated by ~y~%s~s~',
+  ['you_confiscated_account'] = 'you confiscated ~g~$%s~s~ (%s) from ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~$%s~s~ (%s) was confiscated by ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'you confiscated ~b~%s~s~ from ~b~%s~s~ with ~o~%s~s~ bullets',
+  ['got_confiscated_weapon'] = 'your ~b~%s~s~ with ~o~%s~s~ bullets was confiscated by ~y~%s~s~',
   ['traffic_offense'] = 'traffic Offense',
   ['minor_offense'] = 'minor Offense',
   ['average_offense'] = 'average Offense',
   ['major_offense'] = 'major Offense',
-  ['fine_total'] = 'fine: ',
+  ['fine_total'] = 'fine: %s',
   -- Vehicle Info Menu
-  ['plate'] = 'Plate: ',
+  ['plate'] = 'plate: %s',
   ['owner_unknown'] = 'owner: Unknown',
-  ['owner'] = 'owner: ',
+  ['owner'] = 'owner: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'armory - Take Weapon',
   ['put_weapon_menu'] = 'armory - Put Weapon',
@@ -90,13 +95,13 @@ Locales['en'] = {
   ['take_company_money'] = 'withdraw Company Money',
   ['deposit_money'] = 'deposit Money',
   ['amount_of_withdrawal'] = 'amount of Withdrawal',
-  ['invalid_amount'] = 'amount Invalid',
-  ['amount_of_deposit'] = 'amount of Deposit',
+  ['invalid_amount'] = 'amount invalid',
+  ['amount_of_deposit'] = 'amount of deposit',
   ['open_bossmenu'] = 'press ~INPUT_CONTEXT~ to open the menu',
   ['quantity_invalid'] = 'invalid quantity',
   ['have_withdrawn'] = 'you have withdrawn x',
-  ['not_enough_in_society'] = 'there\'s not enough of ~r~that item~w~ in the society!',
-  ['player_cannot_hold'] = 'you do ~r~not~w~ have enough ~y~free space~w~ in your inventory!',
+  ['not_enough_in_society'] = 'there\'s not enough of ~r~that item~s~ in the society!',
+  ['player_cannot_hold'] = 'you do ~r~not~s~ have enough ~y~free space~s~ in your inventory!',
   ['added'] = 'you added x',
   ['quantity'] = 'quantity',
   ['inventory'] = 'inventory',
@@ -105,12 +110,5 @@ Locales['en'] = {
   ['remove_prop'] = 'press ~INPUT_CONTEXT~ to delete the object',
   ['map_blip'] = 'police Station',
   -- Notifications
-  ['from'] = '~s~ from ~b~',
-  ['you_have_confinv'] = 'you have confiscated ~y~x',
-  ['confinv'] = '~s~ confiscated from you ~y~x',
-  ['you_have_confdm'] = 'you have confiscated ~y~$',
-  ['confdm'] = '~s~ confiscated from you ~y~$',
-  ['you_have_confweapon'] = 'you have confiscated ~y~x1 ',
-  ['confweapon'] = '~s~ confiscated from you ~y~x1 ',
   ['alert_police'] = 'alert police',
 }

locales/es.lua

@@ -22,7 +22,7 @@ Locales['es'] = {
   ['vehicle_out'] = 'Ya tienes un vehículo fuera',
   ['vehicle_spawner'] = 'Presionar ~INPUT_CONTEXT~ para sacar un vehículo',
   ['store_vehicle'] = 'Presionar ~INPUT_CONTEXT~ para guardar un vehículo',
-  ['service_max'] = 'Servicio completado : ',
+  ['service_max'] = 'Servicio completado: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'Interacción ciudadana',
   ['vehicle_interaction'] = 'Interacción vehículo',
@@ -63,24 +63,29 @@ Locales['es'] = {
   ['box'] = 'Caja',
   ['cash'] = 'Dinero',
   -- ID Card Menu
-  ['name'] = 'Nombre : ',
-  ['bac'] = 'Alcoolemia : ',
+  ['name'] = 'nombre: %s',
+  ['bac'] = 'alcoolemia: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'Confiscar dinero negro : €',
   ['guns_label'] = '--- Armas ---',
-  ['confiscate'] = 'Confiscar ',
   ['inventory_label'] = '--- Inventario ---',
-  ['confiscate_inv'] = 'Confiscar x',
-
+  ['confiscate'] = 'confiscar %s',
+  ['confiscate_inv'] = 'confiscar %sx %s',
+  ['confiscate_dirty'] = 'confiscar dinero negro: <span style="color:red;">€%s</span>',
+  ['you_confiscated'] = 'you confiscated ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ were confiscated by ~y~%s~s~',
+  ['you_confiscated_account'] = 'you confiscated ~g~€%s~s~ (%s) from ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~€%s~s~ (%s) was confiscated by ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'you confiscated ~b~%s~s~ from ~b~%s~s~ with ~o~%s~s~ bullets',
+  ['got_confiscated_weapon'] = 'your ~b~%s~s~ with ~o~%s~s~ bullets was confiscated by ~y~%s~s~',
   ['traffic_offense'] = 'Delito de tráfico',
   ['minor_offense'] = 'Delito menor',
   ['average_offense'] = 'Delito medio',
   ['major_offense'] = 'Delito grave',
-  ['fine_total'] = 'Multa total : ',
+  ['fine_total'] = 'Multa total: %s',
   -- Vehicle Info Menu
-  ['plate'] = 'N°: ',
-  ['owner_unknown'] = 'Propietario : Desconocido',
-  ['owner'] = 'Propietario : ',
+  ['plate'] = 'n°: %s',
+  ['owner_unknown'] = 'propietario: Desconocido',
+  ['owner'] = 'propietario: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'Arsenal - Coger armas',
   ['put_weapon_menu'] = 'Arsenal - Depositar armas',
@@ -103,12 +108,5 @@ Locales['es'] = {
   ['remove_prop'] = 'Presionar ~INPUT_CONTEXT~ para eliminar el objeto',
   ['map_blip'] = 'Comisaría de policía',
   -- Notifications
-  ['from'] = '~s~ de ~b~',
-  ['you_have_confinv'] = 'Has confiscado ~y~x',
-  ['confinv'] = '~s~ Te han confiscado ~y~x',
-  ['you_have_confdm'] = 'Has confiscado ~y~€',
-  ['confdm'] = '~s~ Te han confiscado ~y~€',
-  ['you_have_confweapon'] = 'Has confiscado ~y~x1 ',
-  ['confweapon'] = '~s~ Te han confiscado ~y~x1 ',
   ['alert_police'] = 'Alerta policia',
 }

locales/fi.lua

@@ -22,7 +22,7 @@ Locales['fi'] = {
   ['vehicle_out'] = 'ajoneuvo on jo ulkona tallista',
   ['vehicle_spawner'] = 'paina ~INPUT_CONTEXT~ ottaaksesi auton ulos',
   ['store_vehicle'] = 'paina ~INPUT_CONTEXT~ laittaaksesi auto talliin',
-  ['service_max'] = 'maksimi määrä poliiseja: ',
+  ['service_max'] = 'maksimi määrä poliiseja: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'siviilin vuorovaikutus',
   ['vehicle_interaction'] = 'ajoneuvon vuorovaikutus',
@@ -63,24 +63,29 @@ Locales['fi'] = {
   ['box'] = 'laatikko',
   ['cash'] = 'rahalaatikko',
   -- ID Card Menu
-  ['name'] = 'nimi : ',
-  ['bac'] = 'alkometri : ',
+  ['name'] = 'nimi: %s',
+  ['bac'] = 'alkometri: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'takavarikoi likainen raha: €',
   ['guns_label'] = '--- Aseet ---',
-  ['confiscate'] = 'takavarikoi ',
   ['inventory_label'] = '--- Reppu ---',
-  ['confiscate_inv'] = 'takavarikoi x',
-
+  ['confiscate'] = 'takavarikoi %s',
+  ['confiscate_inv'] = 'takavarikoi %sx %s',
+  ['confiscate_dirty'] = 'takavarikoi likainen raha: <span style="color:red;">€%s</span>',
+  ['you_confiscated'] = 'you confiscated ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ were confiscated by ~y~%s~s~',
+  ['you_confiscated_account'] = 'you confiscated ~g~$%s~s~ (%s) from ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~$%s~s~ (%s) was confiscated by ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'you confiscated ~b~%s~s~ from ~b~%s~s~ with ~o~%s~s~ bullets',
+  ['got_confiscated_weapon'] = 'your ~b~%s~s~ with ~o~%s~s~ bullets was confiscated by ~y~%s~s~',
   ['traffic_offense'] = 'liikenne rikokset',
   ['minor_offense'] = 'lievät rikokset',
   ['average_offense'] = 'keskisuuret rikokset',
   ['major_offense'] = 'vakavat rikokset',
-  ['fine_total'] = 'sakko: ',
+  ['fine_total'] = 'sakko: %s',
   --Vehicle Info Menu
-  ['plate'] = 'kilpi: ',
+  ['plate'] = 'kilpi: %s',
   ['owner_unknown'] = 'omistaja: Tuntematon',
-  ['owner'] = 'omistaja: ',
+  ['owner'] = 'omistaja: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'asevarasto - Ota ase',
   ['put_weapon_menu'] = 'asevarasto - Laita ase pois',
@@ -103,12 +108,5 @@ Locales['fi'] = {
   ['remove_prop'] = 'Paina ~INPUT_CONTEXT~ poistaaksesi objektin',
   ['map_blip'] = 'Poliisilaitos',
   -- Notifications
-  ['from'] = '~s~ henkilöltä ~b~',
-  ['you_have_confinv'] = 'Takavarikoit ~y~x',
-  ['confinv'] = '~s~ takavarikoi sinulta ~y~x',
-  ['you_have_confdm'] = 'Sinä takavarikoit ~y~€ ',
-  ['confdm'] = '~s~ takavarikoi sinulta ~y~€ ',
-  ['you_have_confweapon'] = 'Takavarikoit ~y~x1 ',
-  ['confweapon'] = '~s~ takavarikoitiin sinulta ~y~x1 ',
   ['alert_police'] = 'hälyytys Poliisi',
 }

locales/fr.lua

@@ -22,7 +22,7 @@ Locales['fr'] = {
   ['vehicle_out'] = 'il y a déja un véhicule de sorti',
   ['vehicle_spawner'] = 'appuyez sur ~INPUT_CONTEXT~ pour sortir un véhicule',
   ['store_vehicle'] = 'appuyez sur ~INPUT_CONTEXT~ pour ranger le véhicule',
-  ['service_max'] = 'Service complet : ',
+  ['service_max'] = 'service complet: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'interaction citoyen',
   ['vehicle_interaction'] = 'interaction véhicule',
@@ -63,24 +63,29 @@ Locales['fr'] = {
   ['box'] = 'caisse',
   ['cash'] = 'caisse',
   -- ID Card Menu
-  ['name'] = 'nom : ',
-  ['bac'] = 'alcoolémie : ',
+  ['name'] = 'nom: %s',
+  ['bac'] = 'alcoolémie: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'confisquer argent sale : $',
   ['guns_label'] = '--- Armes ---',
-  ['confiscate'] = 'confisquer ',
   ['inventory_label'] = '--- Inventaire ---',
-  ['confiscate_inv'] = 'confisquer x',
-
+  ['confiscate'] = 'confisquer %s',
+  ['confiscate_inv'] = 'confisquer %sx %s',
+  ['confiscate_dirty'] = 'confisquer argent sale: <span style="color:red;">€%s</span>',
+  ['you_confiscated'] = 'you confiscated ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ were confiscated by ~y~%s~s~',
+  ['you_confiscated_account'] = 'you confiscated ~g~€%s~s~ (%s) from ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~€%s~s~ (%s) was confiscated by ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'you confiscated ~b~%s~s~ from ~b~%s~s~ with ~o~%s~s~ bullets',
+  ['got_confiscated_weapon'] = 'your ~b~%s~s~ with ~o~%s~s~ bullets was confiscated by ~y~%s~s~',
   ['traffic_offense'] = 'code de la route',
   ['minor_offense'] = 'délit mineur',
   ['average_offense'] = 'délit moyen',
   ['major_offense'] = 'délit grave',
-  ['fine_total'] = 'amende : ',
+  ['fine_total'] = 'amende: %s',
   -- Vehicle Info Menu
-  ['plate'] = 'N°: ',
-  ['owner_unknown'] = 'propriétaire : Inconnu',
-  ['owner'] = 'propriétaire : ',
+  ['plate'] = 'n°: %s',
+  ['owner_unknown'] = 'propriétaire: Inconnu',
+  ['owner'] = 'propriétaire: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'armurerie - Prendre Arme',
   ['put_weapon_menu'] = 'armurerie - Déposer Arme',
@@ -103,12 +108,5 @@ Locales['fr'] = {
   ['remove_prop'] = 'appuyez sur ~INPUT_CONTEXT~ pour enlever l\'objet',
   ['map_blip'] = 'Commissariat',
   -- Notifications
-  ['from'] = '~s~ à ~b~',
-  ['you_have_confinv'] = 'vous avez confisqué ~y~x',
-  ['confinv'] = '~s~ vous a confisqué ~y~x',
-  ['you_have_confdm'] = 'vous avez confisqué ~y~$',
-  ['confdm'] = '~s~ vous a confisqué ~y~$',
-  ['you_have_confweapon'] = 'vous avez confisqué ~y~x1 ',
-  ['confweapon'] = '~s~ vous a confisqué ~y~x1 ',
   ['alert_police'] = 'alerte police',
 }

locales/pl.lua

@@ -22,8 +22,7 @@ Locales['pl'] = {
   ['vehicle_out'] = 'Masz już pojazd poza garażem',
   ['vehicle_spawner'] = 'Naciśnij ~INPUT_CONTEXT~ żeby wziąć pojazd',
   ['store_vehicle'] = 'Naciśnij ~INPUT_CONTEXT~ żeby przechować pojazd',
-  ['service_max'] = 'Maksymalna ilość policjantów na służbie: ',
-
+  ['service_max'] = 'maksymalna ilość policjantów na służbie: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'Interakcja z cywilami',
   ['vehicle_interaction'] = 'Interakcja z pojazdami',
@@ -64,24 +63,29 @@ Locales['pl'] = {
   ['box'] = 'Pudła',
   ['cash'] = 'Paleta z pieniędzmi',
   -- ID Card Menu
-  ['name'] = 'Nazwa : ',
-  ['bac'] = 'bAC : ',
+  ['name'] = 'nazwa: %s',
+  ['bac'] = 'BAC: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'Skonfiskuj brudne pieniądze: $',
   ['guns_label'] = '--- Bronie ---',
-  ['confiscate'] = 'Skonfiskuj ',
   ['inventory_label'] = '--- Ekwipunek ---',
-  ['confiscate_inv'] = 'Skonfiskuj x',
-
+  ['confiscate'] = 'skonfiskuj %s',
+  ['confiscate_inv'] = 'skonfiskuj %sx %s',
+  ['confiscate_dirty'] = 'skonfiskuj brudne pieniądze: <span style="color:red;">$%s</span>',
+  ['you_confiscated'] = 'you confiscated ~y~%sx~s~ ~b~%s~s~ from ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ were confiscated by ~y~%s~s~',
+  ['you_confiscated_account'] = 'you confiscated ~g~$%s~s~ (%s) from ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~$%s~s~ (%s) was confiscated by ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'you confiscated ~b~%s~s~ from ~b~%s~s~ with ~o~%s~s~ bullets',
+  ['got_confiscated_weapon'] = 'your ~b~%s~s~ with ~o~%s~s~ bullets was confiscated by ~y~%s~s~',
   ['traffic_offense'] = 'Wykroczenia drogowe',
   ['minor_offense'] = 'Niewielkie wykroczenia',
   ['average_offense'] = 'Średnie wykroczenia',
   ['major_offense'] = 'Duże wykroczenia',
-  ['fine_total'] = 'Mandat: ',
+  ['fine_total'] = 'mandat: %s',
   -- Vehicle Info Menu
-  ['plate'] = 'Tablica rejestracyjna: ',
-  ['owner_unknown'] = 'Właściciel: Nieznany',
-  ['owner'] = 'Właściciel: ',
+  ['plate'] = 'tablica rejestracyjna: %s',
+  ['owner_unknown'] = 'właściciel: Nieznany',
+  ['owner'] = 'właściciel: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'Zbrojownia - Weź broń',
   ['put_weapon_menu'] = 'Zbrojownia - Odłóż broń',
@@ -106,12 +110,5 @@ Locales['pl'] = {
   ['remove_prop'] = 'Naciśnij ~INPUT_CONTEXT~ aby usunąć ten obiekt',
   ['map_blip'] = 'Komisariat Policji',
   -- Notifications
-  ['from'] = '~s~ od ~b~',
-  ['you_have_confinv'] = 'Skonfiskowałeś ~y~x',
-  ['confinv'] = '~s~ skonfiskowane przez Ciebie ~y~x',
-  ['you_have_confdm'] = 'Skonfiskowałeś ~y~$',
-  ['confdm'] = '~s~ skonfiskowane przez Ciebie ~y~$',
-  ['you_have_confweapon'] = 'Skonfiskowałeś ~y~x1 ',
-  ['confweapon'] = '~s~ skonfiskowane przez Ciebie ~y~x1 ',
   ['alert_police'] = 'Ostrzeż policję',
 }

locales/sv.lua

@@ -1,14 +1,14 @@
 Locales['sv'] = {
   -- Cloakroom
-  ['cloakroom'] = 'Omklädningsrum',
-  ['citizen_wear'] = 'Civila kläder',
-  ['police_wear'] = 'Polisuniform',
-  ['sheriff_wear'] = 'Inspektöruniform',
-  ['lieutenant_wear'] = 'Insatsstyrka',
-  ['gilet_wear'] = 'Reflektiv väst',
-  ['bullet_wear'] = 'Skottsäker väst',
-  ['no_outfit'] = 'Du har ingen uniform!',
-  ['open_cloackroom'] = 'tryck ~INPUT_CONTEXT~ för att byta ~y~kläder~s~.',
+  ['cloakroom'] = 'omklädningsrum',
+  ['citizen_wear'] = 'civila kläder',
+  ['police_wear'] = 'polisuniform',
+  ['sheriff_wear'] = 'inspektöruniform',
+  ['lieutenant_wear'] = 'insatsstyrka',
+  ['gilet_wear'] = 'reflektiv väst',
+  ['bullet_wear'] = 'skottsäker väst',
+  ['no_outfit'] = 'det finns ingen uniform som passar dig!',
+  ['open_cloackroom'] = 'tryck ~INPUT_CONTEXT~ för att välja ~y~kläder~s~.',
   -- Armory
   ['remove_object'] = 'Ta ut objekt',
   ['deposit_object'] = 'Lägg in objekt',
@@ -22,7 +22,7 @@ Locales['sv'] = {
   ['vehicle_out'] = 'Det finns redan en bil ute!',
   ['vehicle_spawner'] = 'Tryck ~INPUT_CONTEXT~ för att ta ut en bil',
   ['store_vehicle'] = 'Tryck ~INPUT_CONTEXT~ för att parkera bilen',
-  ['service_max'] = 'Max officers in service: ',
+  ['service_max'] = 'max antal poliser i tjänst: %s/%s',
   -- Action Menu
   ['citizen_interaction'] = 'Handlingar mot civila',
   ['vehicle_interaction'] = 'Handlingar på bilar',
@@ -63,24 +63,29 @@ Locales['sv'] = {
   ['box'] = 'låda',
   ['cash'] = 'låda med pengar',
   -- ID Card Menu
-  ['name'] =' Namn: ',
-  ['bac'] = 'Procent alkohol i blodet: ',
+  ['name'] ='namn: %s',
+  ['bac'] = 'procent alkohol i blodet: %s',
   -- Body Search Menu
-  ['confiscate_dirty'] = 'Konfiskera svarta pengar: $',
-  ['guns_label'] = '--- Guns ---',
-  ['confiscate'] = 'Konfiskera',
+  ['guns_label'] = '--- Vapen ---',
   ['inventory_label'] = '--- Inventory ---',
-  ['confiscate_inv'] = 'Konfiskera x',
-
-  ['traffic_offense'] = 'Brutit mot trafikregler',
-  ['minor_offense'] = 'Mindre lagbrott',
-  ['average_offense'] = 'Medel lagbrott',
-  ['major_offense'] = 'Grovt lagbrott',
-  ['fine_total'] = 'Böter: ',
+  ['confiscate'] = 'beslagta %s',
+  ['confiscate_inv'] = 'beslagta %sx %s',
+  ['confiscate_dirty'] = 'beslagta svarta pengar: <span style="color:red;">$%s</span>',
+  ['you_confiscated'] = 'du beslagtog ~y~%sx~s~ ~b~%s~s~ från ~b~%s~s~',
+  ['got_confiscated'] = '~y~%sx~s~ ~b~%s~s~ beslagtogs av ~y~%s~s~',
+  ['you_confiscated_account'] = 'du beslagtog ~g~$%s~s~ (%s) från ~b~%s~s~',
+  ['got_confiscated_account'] = '~g~$%s~s~ (%s) beslagtogs av ~y~%s~s~',
+  ['you_confiscated_weapon'] = 'du beslagtog ~b~%s~s~ från ~b~%s~s~ med ~o~%s~s~ skott',
+  ['got_confiscated_weapon'] = 'din ~b~%s~s~ med ~o~%s~s~ skott beslagtogs av ~y~%s~s~',
+  ['traffic_offense'] = 'brott mot trafikregler',
+  ['minor_offense'] = 'mindre lagbrott',
+  ['average_offense'] = 'medel lagbrott',
+  ['major_offense'] = 'grovt lagbrott',
+  ['fine_total'] = 'böter: %s',
   -- Vehicle Info Menu
-  ['plate'] = 'Reg nummer: ',
-  ['owner_unknown'] = 'Ägare: Okänt',
-  ['owner'] = 'Ägare: ',
+  ['plate'] = 'reg nummer: %s',
+  ['owner_unknown'] = 'ägare: Okänt',
+  ['owner'] = 'ägare: %s',
   -- Weapons Menus
   ['get_weapon_menu'] = 'Vapenförråd - Ta vapen',
   ['put_weapon_menu'] = 'Vapenförråd - Lägg in vapen',
@@ -103,12 +108,5 @@ Locales['sv'] = {
   ['remove_prop'] = 'tryck ~INPUT_CONTEXT~ för att ta bort obejektet',
   ['map_blip'] = 'Polisstation',
   -- Notifications
-  ['from'] = '~s~ från ~b~',
-  ['you_have_confinv'] = 'Du har konfiskerat ~y~x',
-  ['confinv'] = '~s~ konfiskerade ~y~x',
-  ['you_have_confdm'] = 'Du har konfiskerat ~y~$',
-  ['confdm'] = '~s~ konfiskerade ~y~$',
-  ['you_have_confweapon'] = 'Du har konfiskerat ~y~x1 ',
-  ['confweapon'] = '~s~ konfiskerade ~y~x1 ',
   ['alert_police'] = 'Meddela polisen',
 }

localization/de_esx_policejob.sql

@@ -1,3 +1,5 @@
+USE `essentialmode`;
+
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police','Polizei',1)
 ;
@@ -11,7 +13,7 @@ INSERT INTO `addon_inventory` (name, label, shared) VALUES
 ;
 
 INSERT INTO `jobs` (name, label) VALUES
-	('police','LSPD')
+	('police', 'Polizei')
 ;
 
 INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES

localization/en_esx_policejob.sql

@@ -1,9 +1,11 @@
+USE `essentialmode`;
+
 INSERT INTO `addon_account` (name, label, shared) VALUES
-	('society_police','Police',1)
+	('society_police', 'Police', 1)
 ;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
-	('society_police','Police',1)
+	('society_police', 'Police', 1)
 ;
 
 INSERT INTO `addon_inventory` (name, label, shared) VALUES
@@ -11,7 +13,7 @@ INSERT INTO `addon_inventory` (name, label, shared) VALUES
 ;
 
 INSERT INTO `jobs` (name, label) VALUES
-	('police','LSPD')
+	('police', 'Police')
 ;
 
 INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES

localization/fi_esx_policejob.sql

@@ -1,9 +1,11 @@
+USE `essentialmode`;
+
 INSERT INTO `addon_account` (name, label, shared) VALUES
-	('society_police','Poliisi',1)
+	('society_police', 'Poliisi', 1)
 ;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
-	('society_police','Poliisi',1)
+	('society_police', 'Poliisi', 1)
 ;
 
 INSERT INTO `addon_inventory` (name, label, shared) VALUES
@@ -11,7 +13,7 @@ INSERT INTO `addon_inventory` (name, label, shared) VALUES
 ;
 
 INSERT INTO `jobs` (name, label) VALUES
-	('police','Poliisi')
+	('police', 'Poliisi')
 ;
 
 INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES

localization/pl_esx_policejob.sql

@@ -1,9 +1,11 @@
+USE `essentialmode`;
+
 INSERT INTO `addon_account` (name, label, shared) VALUES
-	('society_police','Police',1)
+	('society_police', 'Police', 1)
 ;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
-	('society_police','Police',1)
+	('society_police', 'Police', 1)
 ;
 
 INSERT INTO `addon_inventory` (name, label, shared) VALUES
@@ -11,7 +13,7 @@ INSERT INTO `addon_inventory` (name, label, shared) VALUES
 ;
 
 INSERT INTO `jobs` (name, label) VALUES
-	('police','LSPD')
+	('police', 'Police')
 ;
 
 INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
@@ -23,7 +25,6 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_
 ;
 
 CREATE TABLE `fine_types` (
-
 	`id` int(11) NOT NULL AUTO_INCREMENT,
 	`label` varchar(255) DEFAULT NULL,
 	`amount` int(11) DEFAULT NULL,

localization/sv_esx_policejob.sql

@@ -1,9 +1,11 @@
+USE `essentialmode`;
+
 INSERT INTO `addon_account` (name, label, shared) VALUES
-	('society_police','Polis',1)
+	('society_police', 'Polis', 1)
 ;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
-	('society_police','Polis',1)
+	('society_police', 'Polis', 1)
 ;
 
 INSERT INTO `addon_inventory` (name, label, shared) VALUES
@@ -11,7 +13,7 @@ INSERT INTO `addon_inventory` (name, label, shared) VALUES
 ;
 
 INSERT INTO `jobs` (name, label) VALUES
-	('police','Polis')
+	('police', 'Polis')
 ;
 
 INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
@@ -36,11 +38,11 @@ INSERT INTO `fine_types` (label, amount, category) VALUES
 	('Missbruk av tuta',30,0),
 	('Köra över heldragen linje',40,0),
 	('Kört i motsatt riktning i rondell',250,0),
-	('Olaglig U-Sväng',250,0),
-	('Olovlig körning i skogen',170,0),
+	('Olaglig u-sväng',250,0),
+	('Olovlig körning i terräng',170,0),
 	('Kört för nära bil framför',30,0),
-	('Trafikfarligt stopp',150,0),
-	('olaglig parkering',70,0),
+	('Trafikfarlig stopp',150,0),
+	('Olaglig parkering',70,0),
 	('Använder inte högerregeln',70,0),
 	('Aktar sig inte för tjänstefordon i utryckning',90,0),
 	('Kört förbi stoppskylt',105,0),
@@ -48,7 +50,7 @@ INSERT INTO `fine_types` (label, amount, category) VALUES
 	('Farlig omkörning',100,0),
 	('Fordon i dåligt skick',100,0),
 	('Kört utan körkort',1500,0),
-	('smitning från olycka',800,0),
+	('Smitning från olycka',800,0),
 	('Kört för fort < 5 kmh',90,0),
 	('Kört för fort 5-15 kmh',120,0),
 	('Kört för fort 15-30 kmh',180,0),
@@ -75,14 +77,14 @@ INSERT INTO `fine_types` (label, amount, category) VALUES
 	('Hålla gisslan/Hålla person mot dess vilja',1500,2),
 	('Kidnappa en tjänsteman',2000,2),
 	('Rån',650,2),
-	('butiksrån',650,2),
-	('bankrån',1500,2),
+	('Butiksrån',650,2),
+	('Bankrån',1500,2),
 	('Skjutit en person',2000,3),
 	('Skjutit en tjänsteman',2500,3),
-	('mordförsök',3000,3),
-	('Mordförsök på tjänsteman',5000,3),
-	('mord',10000,3),
-	('mord på tjänsteman',30000,3),
-	('dråp',1800,3),
+	('Mordförsök',3000,3),
+	('Mordförsök på tjänsteman',6000,3),
+	('Mord',10000,3),
+	('Mord på tjänsteman',30000,3),
+	('Dråp',1800,3),
 	('Olagliga aktiviteter inom ett företag',2000,2)
 ;

server/main.lua

@@ -33,9 +33,9 @@ AddEventHandler('esx_policejob:confiscatePlayerItem', function(target, itemType,
 				TriggerClientEvent('esx:showNotification', _source, _U('invalid_quantity'))
 			else
 				targetXPlayer.removeInventoryItem(itemName, amount)
-				sourceXPlayer.addInventoryItem(itemName, amount)
-				TriggerClientEvent('esx:showNotification', sourceXPlayer.source, _U('you_have_confinv') .. amount .. ' ' .. sourceItem.label .. _U('from') .. targetXPlayer.name)
-				TriggerClientEvent('esx:showNotification', targetXPlayer.source, '~b~' .. targetXPlayer.name .. _U('confinv') .. amount .. ' ' .. sourceItem.label)
+				sourceXPlayer.addInventoryItem   (itemName, amount)
+				TriggerClientEvent('esx:showNotification', _source, _U('you_confiscated', amount, sourceItem.label, targetXPlayer.name))
+				TriggerClientEvent('esx:showNotification', target,  _U('got_confiscated', amount, sourceItem.label, sourceXPlayer.name))
 			end
 		else
 			TriggerClientEvent('esx:showNotification', _source, _U('invalid_quantity'))
@@ -43,17 +43,18 @@ AddEventHandler('esx_policejob:confiscatePlayerItem', function(target, itemType,
 
 	elseif itemType == 'item_account' then
 		targetXPlayer.removeAccountMoney(itemName, amount)
-		sourceXPlayer.addAccountMoney(itemName, amount)
+		sourceXPlayer.addAccountMoney   (itemName, amount)
 
-		TriggerClientEvent('esx:showNotification', sourceXPlayer.source, _U('you_have_confdm') .. amount .. _U('from') .. targetXPlayer.name)
-		TriggerClientEvent('esx:showNotification', targetXPlayer.source, '~b~' .. targetXPlayer.name .. _U('confdm') .. amount)
+		TriggerClientEvent('esx:showNotification', _source, _U('you_confiscated_account', amount, itemName, targetXPlayer.name))
+		TriggerClientEvent('esx:showNotification', target,  _U('got_confiscated_account', amount, itemName, sourceXPlayer.name))
 
 	elseif itemType == 'item_weapon' then
-		targetXPlayer.removeWeapon(itemName)
-		sourceXPlayer.addWeapon(itemName, amount)
+		if amount == nil then amount = 0 end
+		targetXPlayer.removeWeapon(itemName, amount)
+		sourceXPlayer.addWeapon   (itemName, amount)
 
-		TriggerClientEvent('esx:showNotification', sourceXPlayer.source, _U('you_have_confweapon') .. ESX.GetWeaponLabel(itemName) .. _U('from') .. targetXPlayer.name)
-		TriggerClientEvent('esx:showNotification', targetXPlayer.source, '~b~' .. targetXPlayer.name .. _U('confweapon') .. ESX.GetWeaponLabel(itemName))
+		TriggerClientEvent('esx:showNotification', _source, _U('you_confiscated_weapon', ESX.GetWeaponLabel(itemName), targetXPlayer.name, amount))
+		TriggerClientEvent('esx:showNotification', target,  _U('got_confiscated_weapon', ESX.GetWeaponLabel(itemName), amount, sourceXPlayer.name))
 	end
 end)
 
@@ -488,7 +489,7 @@ AddEventHandler('playerDropped', function()
 			Citizen.Wait(5000)
 			TriggerClientEvent('esx_policejob:updateBlip', -1)
 		end
-	end
+	end	
 end)
 
 RegisterServerEvent('esx_policejob:spawned')