Proper group digits and proper formatting

client/main.lua

@@ -116,20 +116,35 @@ function OpenDMVSchoolMenu()
 	local elements = {}
 
 	if not ownedLicenses['dmv'] then
-		table.insert(elements, {label = _U('theory_test') .. ' <span style="color: green;">$' .. Config.Prices['dmv'] .. '</span>', value = 'theory_test'})
+		table.insert(elements, {
+			label = (('%s: <span style="color:green;">%s</span>'):format(_U('theory_test'), _U('school_item', ESX.Math.GroupDigits(Config.Prices['dmv'])))),
+			value = 'theory_test'
+		})
 	end
 
 	if ownedLicenses['dmv'] then
 		if not ownedLicenses['drive'] then
-			table.insert(elements, {label = _U('road_test_car') .. ' <span style="color: green;">$' .. Config.Prices['drive'] .. '</span>', value = 'drive_test', type = 'drive'})
+			table.insert(elements, {
+				label = (('%s: <span style="color:green;">%s</span>'):format(_U('road_test_car'), _U('school_item', ESX.Math.GroupDigits(Config.Prices['drive'])))),
+				value = 'drive_test',
+				type = 'drive'
+			})
 		end
 
 		if not ownedLicenses['drive_bike'] then
-			table.insert(elements, {label = _U('road_test_bike') .. ' <span style="color: green;">$' .. Config.Prices['drive_bike'] .. '</span>', value = 'drive_test', type = 'drive_bike'})
+			table.insert(elements, {
+				label = (('%s: <span style="color:green;">%s</span>'):format(_U('road_test_bike'), _U('school_item', ESX.Math.GroupDigits(Config.Prices['drive_bike'])))),
+				value = 'drive_test',
+				type = 'drive_bike'
+			})
 		end
 
 		if not ownedLicenses['drive_truck'] then
-			table.insert(elements, {label = _U('road_test_truck') .. ' <span style="color: green;">$' .. Config.Prices['drive_truck'] .. '</span>', value = 'drive_test', type = 'drive_truck'})
+			table.insert(elements, {
+				label = (('%s: <span style="color:green;">%s</span>'):format(_U('drive_truck'), _U('school_item', ESX.Math.GroupDigits(Config.Prices['drive_truck'])))),
+				value = 'drive_test',
+				type = 'drive_truck'
+			})
 		end
 	end
 
@@ -160,17 +175,17 @@ RegisterNUICallback('question', function(data, cb)
 		openSection = 'question'
 	})
 
-	cb('OK')
+	cb()
 end)
 
 RegisterNUICallback('close', function(data, cb)
 	StopTheoryTest(true)
-	cb('OK')
+	cb()
 end)
 
 RegisterNUICallback('kick', function(data, cb)
 	StopTheoryTest(false)
-	cb('OK')
+	cb()
 end)
 
 AddEventHandler('esx_dmvschool:hasEnteredMarker', function(zone)
@@ -275,7 +290,6 @@ Citizen.CreateThread(function()
 		Citizen.Wait(0)
 
 		if CurrentAction then
-
 			ESX.ShowHelpNotification(CurrentActionMsg)
 
 			if IsControlJustReleased(0, Keys['E']) then

locales/br.lua

@@ -17,6 +17,7 @@ Locales['br'] = {
   ['road_test_car'] = 'teste de habilidades de condução',
   ['road_test_bike'] = 'teste de habilidades da motocicleta',
   ['road_test_truck'] = 'teste de habilidades de caminhão',
+  ['school_item'] = '$%s',
   ['driving_school'] = 'escola de condução',
   ['press_open_menu'] = 'pressione ~INPUT_CONTEXT~ para abrir o menu',
   ['driving_school_blip'] = 'escola de condução',

locales/en.lua

@@ -17,6 +17,7 @@ Locales['en'] = {
   ['road_test_car'] = 'driving Test',
   ['road_test_bike'] = 'motorcycle Skills Test',
   ['road_test_truck'] = 'truck Skills Test',
+  ['school_item'] = '$%s',
   ['driving_school'] = 'driving School',
   ['press_open_menu'] = 'press ~INPUT_CONTEXT~ to open the menu',
   ['driving_school_blip'] = 'driving School',

locales/fi.lua

@@ -17,6 +17,7 @@ Locales['fi'] = {
   ['road_test_car'] = 'ajokoe',
   ['road_test_bike'] = 'moottoripyörä ajokoe',
   ['road_test_truck'] = 'rekka ajokoe',
+  ['school_item'] = '$%s',
   ['driving_school'] = 'Autokoulu',
   ['press_open_menu'] = 'paina ~INPUT_CONTEXT~ hankkiaksesi ajokortin',
   ['driving_school_blip'] = 'Autokoulu',

locales/fr.lua

@@ -17,6 +17,7 @@ Locales['fr'] = {
   ['road_test_car'] = 'examen de conduite [voiture]',
   ['road_test_bike'] = 'examen de conduite [moto]',
   ['road_test_truck'] = 'examen de conduite [camion]',
+  ['school_item'] = '$%s',
   ['driving_school'] = 'ecole de conduite',
   ['press_open_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour ouvrir le menu',
   ['driving_school_blip'] = 'auto-école',

locales/pl.lua

@@ -17,6 +17,7 @@ Locales['pl'] = {
   ['road_test_car'] = 'egzamin praktyczny kat. B',
   ['road_test_bike'] = 'egzamin praktyczny kat. A',
   ['road_test_truck'] = 'egzamin praktyczny kat. C',
+  ['school_item'] = '$%s',
   ['driving_school'] = 'szkoła jazdy',
   ['press_open_menu'] = 'wciśnij ~INPUT_CONTEXT~ by otworzyć menu',
   ['driving_school_blip'] = 'ośrodek egzaminacyjny',

locales/sv.lua

@@ -17,6 +17,7 @@ Locales['sv'] = {
   ['road_test_car'] = 'B-körkort (personbil)',
   ['road_test_bike'] = 'A-körkort (motorcykel)',
   ['road_test_truck'] = 'C-körkort (lastbil)',
+  ['school_item'] = '%s SEK',
   ['driving_school'] = 'körskola',
   ['press_open_menu'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn',
   ['driving_school_blip'] = 'körskola',

server/main.lua

@@ -25,5 +25,5 @@ AddEventHandler('esx_dmvschool:pay', function(price)
 	local xPlayer = ESX.GetPlayerFromId(_source)
 
 	xPlayer.removeMoney(price)
-	TriggerClientEvent('esx:showNotification', _source, _U('you_paid', price))
+	TriggerClientEvent('esx:showNotification', _source, _U('you_paid', ESX.Math.GroupDigits(price)))
 end)