From aae7f2bdead51c033d1a497c739f6bfe3719c73f Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 25 Aug 2018 12:23:03 +0200 Subject: [PATCH] String formatting, closes #49 --- client/main.lua | 6 ++-- locales/br.lua | 41 +++++++++++++-------------- locales/en.lua | 11 +++----- locales/fi.lua | 9 ++---- locales/fr.lua | 9 ++---- locales/sv.lua | 73 ++++++++++++++++++++++++------------------------- server/main.lua | 7 +++-- 7 files changed, 71 insertions(+), 85 deletions(-) diff --git a/client/main.lua b/client/main.lua index a5e7ee64..a5ce5d7c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -121,7 +121,7 @@ AddEventHandler('esx_jobs:action', function(job, zone) for k,v in pairs(Config.Jobs) do if PlayerData.job.name == k then for l,w in pairs(v.Zones) do - if (w.Type == "vehspawnpt") and (w.Spawner == zone.Spawner) then + if w.Type == "vehspawnpt" and w.Spawner == zone.Spawner then spawnpt = w spawner = w.Spawner end @@ -468,8 +468,8 @@ Citizen.CreateThread(function() plate = string.gsub(plate, " ", "") for i=1, #myPlate, 1 do - if (myPlate[i] == plate) and (playerPed == driverPed) then - hintToDisplay = zone.Hint .. "\n" .. _U('security_deposit') .. cautionVehicleInCaseofDrop .. "~s~." + if myPlate[i] == plate and playerPed == driverPed then + hintToDisplay = _U('security_deposit', zone.Hint, cautionVehicleInCaseofDrop) isVehicleOwner = true break end diff --git a/locales/br.lua b/locales/br.lua index cc731d9b..37204348 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,35 +1,32 @@ Locales['br'] = { - -- Menus Geral - ['cloakroom'] = 'Vestiário', + -- Global menus + ['cloakroom'] = 'vestiário', ['cloak_change'] = 'pressione ~INPUT_PICKUP~ mudar de roupa.', ['citizen_wear'] = 'retirar uniforme', ['job_wear'] = 'colocar uniforme', - ['bank_deposit'] = 'um depósito de segurança de ~g~', - ['bank_deposit_r'] = 'um depósito de segurança de ~g~$', - ['bank_deposit2'] = '$ ~s~foi feito para você depois do seu desmaio.', + ['bank_deposit_returned'] = 'um depósito de segurança de ~g~$%s~s~ foi devolvido a você.', + ['bank_deposit_taken'] = 'um depósito de segurança de ~g~$%s~s~ foi tirado de você.', ['foot_work'] = 'você deve estar a pé para poder trabalhar.', ['next_point'] = 'vá para o próximo passo depois de completar este.', - ['security_deposit'] = 'a segurança dada será ~g~$', + ['security_deposit'] = '%s \nA segurança dada será ~g~$%s~s~', ['not_your_vehicle'] = 'este não é o seu veículo ou você deve ser um motorista.', ['in_vehicle'] = 'você deve estar em um veículo.', ['wrong_point'] = 'você não está no ponto certo de entrega.', ['max_limit'] = 'você tem o máximo: %s', ['not_enough'] = 'você não tem o suficiente %s para continuar esta tarefa.', - ['caution_taken'] = ' ~s~foi tirado de você.', - ['caution_returned'] = ' ~s~foi devolvido a você.', - ['spawn_veh'] = 'Veiculo Spawnado', + ['spawn_veh'] = 'veiculo Spawnado', ['spawn_veh_button'] = 'pressione ~INPUT_PICKUP~ chamar o veículo de entrega.', ['spawn_truck_button'] = 'pressione ~INPUT_PICKUP~ spawnar o caminhão.', ['service_vh'] = 'veículo de serviço', ['return_vh'] = 'veiculo devolvido', ['return_vh_button'] = 'pressione ~INPUT_PICKUP~ para devolver o veiculo.', ['delivery_point'] = 'ponto de entrega', - ['delivery'] = 'Entrega', + ['delivery'] = 'entrega', ['public_enter'] = 'pressione ~INPUT_PICKUP~ para entrar no prédio.', ['public_leave'] = 'pressione ~INPUT_PICKUP~ para ir à entrada do edifício.', - -- Trabalho de Lenhador - ['lj_locker_room'] = 'Vestiario Lenhador', + -- Lumber Jack job + ['lj_locker_room'] = 'vestiario Lenhador', ['lj_mapblip'] = 'pilha de madeira', ['lj_wood'] = 'madeira', ['lj_pickup'] = 'pressione ~INPUT_PICKUP~ para recuperar madeira.', @@ -41,8 +38,8 @@ Locales['br'] = { ['lj_pick_boards'] = 'pressione ~INPUT_PICKUP~ para recuperar tábuas.', ['lj_deliver_button'] = 'pressione ~INPUT_PICKUP~ para entregar as tábuas.', - -- Pescador - ['fm_fish_locker'] = 'Vestiario Pescador', + -- Fisherman + ['fm_fish_locker'] = 'vestiario Pescador', ['fm_fish'] = 'peixe', ['fm_fish_area'] = 'area de pesca', ['fm_fish_button'] = 'pressione ~INPUT_PICKUP~ para pescar.', @@ -53,9 +50,9 @@ Locales['br'] = { ['fm_boat_return_button'] = 'Pressione ~INPUT_PICKUP~ para devolver o barco.', ['fm_deliver_fish'] = 'pressione ~INPUT_PICKUP~ para entregar os peixes.', - -- Refinador - ['f_oil_refiner'] = 'Vestiario Refinador', - ['f_drill_oil'] = 'Broca de óleo', + -- Fuel + ['f_oil_refiner'] = 'vestiario Refinador', + ['f_drill_oil'] = 'broca de óleo', ['f_fuel'] = 'óleo', ['f_drillbutton'] = 'pressione ~INPUT_PICKUP~ para perfurar.', ['f_fuel_refine'] = 'refinar óleo', @@ -66,8 +63,8 @@ Locales['br'] = { ['f_deliver_gas'] = 'Entregar Gasolina', ['f_deliver_gas_button'] = 'pressione ~INPUT_PICKUP~ para entregar a gasolina.', - -- Minerador - ['m_miner_locker'] = 'Vestiario Minerador', + -- Miner + ['m_miner_locker'] = 'vestiario Minerador', ['m_rock'] = ' Pedregulho', ['m_pickrocks'] = 'pressione ~INPUT_PICKUP~ para obter pedras.', ['m_washrock'] = ' pedras limpas ', @@ -87,11 +84,11 @@ Locales['br'] = { ['m_deliver_diamond'] = 'pressione ~INPUT_PICKUP~ para entregar diamantes.', ['m_melt_button'] = 'pressione ~INPUT_PICKUP~ para derreter as pedras.', - -- Jornalista + -- Reporter ['reporter_name'] = 'Globo News', ['reporter_garage'] = 'Pressione ~INPUT_PICKUP~ para descer à garagem.', - -- Abatedor + -- Slaughterer ['s_slaughter_locker'] = 'Vestiario Abatedor', ['s_hen'] = 'galinheiro', ['s_alive_chicken'] = 'galinha viva', @@ -105,7 +102,7 @@ Locales['br'] = { ['s_unpackaged_button'] = 'pressione ~INPUT_PICKUP~ para colocar o frango em uma bandeja.', ['s_deliver'] = 'pressione ~INPUT_PICKUP~ para entregar as bandejas de frango.', - -- Costureiro + -- Dress Designer ['dd_dress_locker'] = 'Vestiario Costureiro', ['dd_wool'] = 'lã', ['dd_pickup'] = 'pressione ~INPUT_PICKUP~ para obter lã.', diff --git a/locales/en.lua b/locales/en.lua index 41efbeea..bdc260ca 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -4,19 +4,16 @@ Locales['en'] = { ['cloak_change'] = 'press ~INPUT_PICKUP~ to change clothes.', ['citizen_wear'] = 'civilian clothes', ['job_wear'] = 'workers clothes', - ['bank_deposit_g'] = 'a security deposit of ~g~$', - ['bank_deposit_r'] = 'a security deposit of ~r~$', - ['bank_deposit2'] = '$ ~s~was made to you after your fainting.', + ['bank_deposit_returned'] = 'a security deposit of ~g~$%s~s~ was returned to you.', + ['bank_deposit_taken'] = 'a security deposit of ~r~$%s~s~ was taken from you.', ['foot_work'] = 'you have to be on foot to be able to work.', ['next_point'] = 'go to the next step after completing this one.', - ['security_deposit'] = 'you will be given ~g~$', + ['security_deposit'] = '%s \nYou will be given ~g~$%s~s~', ['not_your_vehicle'] = 'this is not your vehicle or you must be a driver.', - ['in_vehicle'] = 'you must be in a vehicle.', + ['in_vehicle'] = 'you must sit in a vehicle.', ['wrong_point'] = 'you are not at the right point of delivery.', ['max_limit'] = 'you have cannot carry more: %s', ['not_enough'] = 'you do not have enough %s to continue this task.', - ['caution_taken'] = ' ~s~was taken from you.', - ['caution_returned'] = ' ~s~was returned to you.', ['spawn_veh'] = 'spawn vehicle', ['spawn_veh_button'] = 'press ~INPUT_PICKUP~ to call the delivery vehicle.', ['spawn_truck_button'] = 'press ~INPUT_PICKUP~ to spawn the truck.', diff --git a/locales/fi.lua b/locales/fi.lua index 99bdd198..1af7a38d 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -4,19 +4,16 @@ Locales['fi'] = { ['cloak_change'] = 'paina ~INPUT_PICKUP~ vaihtaaksesi vaatteet', ['citizen_wear'] = 'siviilivaatteet', ['job_wear'] = 'työvaatteet', - ['bank_deposit_g'] = 'vakuuden summa ~g~€', - ['bank_deposit_r'] = 'vakuuden summa ~r~€', - ['bank_deposit2'] = '€ ~s~annettiin sinulle pyörtymisen jälkeen', + ['bank_deposit_returned'] = 'vakuuden summa ~g~€%s~s~ palautettiin sinulle.', + ['bank_deposit_taken'] = 'vakuuden summa ~r~€%s~s~ otettiin sinulta.', ['foot_work'] = 'sinun täytyy olla jalan, jotta voit työskennellä', ['next_point'] = 'mene seuraavaan pisteeseen kun olet valmis täällä', - ['security_deposit'] = 'vakuus joka annetaan on ~g~€', + ['security_deposit'] = '%s \nVakuus joka annetaan on ~g~€%s~s~', ['not_your_vehicle'] = "tämä ei ole sinun ajoneuvo tai et ole sen kuski", ['in_vehicle'] = 'sinun täytyy olla ajoneuvossa', ['wrong_point'] = "et ole oikeassa paikassa", ['max_limit'] = 'sinulla on jo maksimi määrä: %s', ['not_enough'] = 'sinulla ei ole tarpeeksi %s jatkaaksesi täällä.', - ['caution_taken'] = ' ~s~otettiin sinulta.', - ['caution_returned'] = ' ~s~palautettiin sinulle.', ['spawn_veh'] = 'spawnaa ajoneuvo', ['spawn_veh_button'] = 'paina ~INPUT_PICKUP~ soittaaksesi kuljetus ajoneuvo', ['spawn_truck_button'] = 'paina ~INPUT_PICKUP~ spawnataksesi rekka.', diff --git a/locales/fr.lua b/locales/fr.lua index d556e97e..0c1269a7 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -4,19 +4,16 @@ Locales['fr'] = { ['cloak_change'] = 'appuyez sur ~INPUT_PICKUP~ pour vous changer.', ['citizen_wear'] = 'tenue civile', ['job_wear'] = 'tenue de travail', - ['bank_deposit_g'] = 'une caution de ~g~', - ['bank_deposit_r'] = 'une caution de ~g~$', - ['bank_deposit2'] = '$ ~s~vous a été rendue suite à votre évanouissment.', + ['bank_deposit_returned'] = 'une caution de ~g~$%s~s~ vous a été rendue.', + ['bank_deposit_taken'] = 'une caution de ~g~$%s~s~ vous a été prélevée.', ['foot_work'] = 'vous devez être à pied pour pouvoir travailler.', ['next_point'] = 'rendez-vous à la prochaine étape après avoir complété celle-ci.', - ['security_deposit'] = 'la caution rendue sera de ~g~$', + ['security_deposit'] = '%s \nLa caution rendue sera de ~g~$%s~s~', ['not_your_vehicle'] = "ce n'est pas votre véhicule ou vous devez être conducteur.", ['in_vehicle'] = 'vous devez être dans un véhicule.', ['wrong_point'] = "vous n'êtes pas au bon point de livraison.", ['max_limit'] = 'vous avez le maximum de: %s', ['not_enough'] = 'vous n\'avez plus assez de %s pour continuer cette tâche.', - ['caution_taken'] = ' ~s~vous a été prélevée.', - ['caution_returned'] = ' ~s~vous a été rendue.', ['spawn_veh'] = 'spawner véhicule de fonction', ['spawn_veh_button'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le véhicule de livraison.', ['spawn_truck_button'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le camion.', diff --git a/locales/sv.lua b/locales/sv.lua index 9a293b9d..f93574b7 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -4,32 +4,29 @@ Locales['sv'] = { ['cloak_change'] = 'tryck ~INPUT_PICKUP~ för att byta kläder.', ['citizen_wear'] = 'civilkläder', ['job_wear'] = 'arbetskläder', - ['bank_deposit_g'] = 'en deposition på ~g~$', - ['bank_deposit_r'] = 'en deposition på ~r~$', - ['bank_deposit2'] = '$ ~s~was made to you after your fainting.', + ['bank_deposit_returned'] = 'en deposition på ~g~%s SEK~s~ har återvänts till dig.', + ['bank_deposit_taken'] = 'en deposition på ~r~%s SEK~s~ togs från dig.', ['foot_work'] = 'du måste vara till fots för att kunna arbeta.', - ['next_point'] = 'gå till nästa steg efter att du har avslutat det här steget.', - ['security_deposit'] = 'säkerheten kommer att ges ~g~$', - ['not_your_vehicle'] = "det här är inte ditt fordon eller så måste du vara föraren.", - ['in_vehicle'] = 'du måste vara i ett fordon.', - ['wrong_point'] = "du är inte på rätt leveranspunkt.", + ['next_point'] = 'gå till nästa steg efter att du har avslutat här.', + ['security_deposit'] = '%s \nDu kommer få tillbaka ~g~%s SEK~s~', + ['not_your_vehicle'] = 'det här är inte ditt fordon eller så måste du vara föraren.', + ['in_vehicle'] = 'du måste sitta i ett fordon!', + ['wrong_point'] = 'du är inte på rätt leveranspunkt!', ['max_limit'] = 'du kan inte bära mer: %s', - ['not_enough'] = "du har inte tillräckligt med %s för att fortsätta denna uppgift.", - ['caution_taken'] = ' ~s~togs från dig.', - ['caution_returned'] = ' ~s~återvände till dig.', - ['spawn_veh'] = 'spawn vehicle', + ['not_enough'] = 'du har inte tillräckligt med %s för att fortsätta denna uppgift.', + ['spawn_veh'] = 'spawna fordon', ['spawn_veh_button'] = 'tryck ~INPUT_PICKUP~ för att ringa leveransfordonet.', ['spawn_truck_button'] = 'tryck ~INPUT_PICKUP~ för att spawna bilen.', - ['service_vh'] = 'service vehicle', - ['return_vh'] = 'vehicle return', + ['service_vh'] = 'service fordon', + ['return_vh'] = 'lämna service fordon', ['return_vh_button'] = 'tryck ~INPUT_PICKUP~ för att ge tillbaka fordonet.', - ['delivery_point'] = 'delivery point', - ['delivery'] = 'delivery', + ['delivery_point'] = 'leveranspunkt', + ['delivery'] = 'leverans', ['public_enter'] = 'tryck ~INPUT_PICKUP~ för att gå in i byggnaden.', ['public_leave'] = 'tryck ~INPUT_PICKUP~ för att lämna byggnaden.', -- Lumber Jack job - ['lj_locker_room'] = "Skogshuggare omklädningsrum", + ['lj_locker_room'] = 'skogshuggare omklädningsrum', ['lj_mapblip'] = 'trähög', ['lj_wood'] = 'träd', ['lj_pickup'] = 'tryck ~INPUT_PICKUP~ för att hämta trä.', @@ -42,14 +39,14 @@ Locales['sv'] = { ['lj_deliver_button'] = 'tryck ~INPUT_PICKUP~ för att sälja brädorna.', -- Fisherman - ['fm_fish_locker'] = "Fiskarens Omklädningsrum", + ['fm_fish_locker'] = 'fiskarens omklädningsrum', ['fm_fish'] = 'fisk', ['fm_fish_area'] = 'fiskeoområde', ['fm_fish_button'] = 'tryck ~INPUT_PICKUP~ för att fiska.', ['fm_spawnboat_title'] = 'spawn boat', ['fm_spawnboat'] = 'tryck ~INPUT_PICKUP~ för att spawna båten.', ['fm_boat_title'] = 'båt', - ['fm_boat_return_title'] = 'boat return', + ['fm_boat_return_title'] = 'lämna tillbaka båt', ['fm_boat_return_button'] = 'tryck ~INPUT_PICKUP~ för att återvända båten.', ['fm_deliver_fish'] = 'tryck ~INPUT_PICKUP~ för att sälja fisk.', @@ -57,17 +54,17 @@ Locales['sv'] = { ['f_oil_refiner'] = 'Oljeraffinaderi Omklädningsrum', ['f_drill_oil'] = 'borra efter olja', ['f_fuel'] = 'olja', - ['f_drillbutton'] = 'tryck ~INPUT_PICKUP~ för att borra.', - ['f_fuel_refine'] = 'förfina oljan', - ['f_refine_fuel_button'] = 'tryck ~INPUT_PICKUP~ för att förfina oljan', - ['f_fuel_mixture'] = 'Blanda raffinerad olja', + ['f_drillbutton'] = 'tryck ~INPUT_PICKUP~ för att borra efter olja.', + ['f_fuel_refine'] = 'raffinera oljan', + ['f_refine_fuel_button'] = 'tryck ~INPUT_PICKUP~ för att raffinera oljan', + ['f_fuel_mixture'] = 'blanda raffinerad olja', ['f_gas'] = 'gas', ['f_fuel_mixture_button'] = 'tryck ~INPUT_PICKUP~ för att mixa', - ['f_deliver_gas'] = 'deliver Gas', - ['f_deliver_gas_button'] = "tryck ~INPUT_PICKUP~ för att sälja bensin", + ['f_deliver_gas'] = 'leverera gas', + ['f_deliver_gas_button'] = 'tryck ~INPUT_PICKUP~ för att sälja bensin', -- Miner - ['m_miner_locker'] = "Gruvarbetarnas Omklädningsrum", + ['m_miner_locker'] = 'Gruvarbetarnas Omklädningsrum', ['m_rock'] = 'sten', ['m_pickrocks'] = 'tryck ~INPUT_PICKUP~ för att hämta sten.', ['m_washrock'] = 'sten tvättning', @@ -80,7 +77,7 @@ Locales['sv'] = { ['m_sell_iron'] = 'järnsäljare', ['m_deliver_iron'] = 'tryck ~INPUT_PICKUP~ för att sälja järn.', ['m_gold'] = 'guld', - ['m_sell_gold'] = "guldsäljare", + ['m_sell_gold'] = 'guldsäljare', ['m_deliver_gold'] = 'tryck ~INPUT_PICKUP~ för att sälja guld.', ['m_diamond'] = 'diamant', ['m_sell_diamond'] = 'diamantsäljare', @@ -88,30 +85,30 @@ Locales['sv'] = { ['m_melt_button'] = 'tryck ~INPUT_PICKUP~ för att smälta sten.', -- Reporter - ['reporter_name'] = 'Aftonbladet', + ['reporter_name'] = 'aftonbladet', ['reporter_garage'] = 'tryck ~INPUT_PICKUP~ för att gå ner till garaget.', -- Slaughterer - ['s_slaughter_locker'] = "Slaktarens Omklädningsrum", + ['s_slaughter_locker'] = 'slaktarens omklädningsrum', ['s_hen'] = 'hönshus', ['s_alive_chicken'] = 'Levande Kyckling', ['s_catch_hen'] = 'tryck ~INPUT_PICKUP~ för att fånga en kyckling.', - ['s_slaughtered_chicken'] = 'chicken to be packed', - ['s_chop_animal'] = 'tryck ~INPUT_PICKUP~ för att slakta kycklingen.', + ['s_slaughtered_chicken'] = 'kyckling som ska packas', + ['s_chop_animal'] = 'tryck ~INPUT_PICKUP~ för att slakta kycklingar.', ['s_slaughtered'] = 'Slaktarhus', ['s_package'] = 'förpackning', ['s_packagechicken'] = 'kyckling i förpackning', ['s_unpackaged'] = 'kyckling väntar på att förpackas', - ['s_unpackaged_button'] = 'tryck ~INPUT_PICKUP~ för att förpacka kycklingen.', - ['s_deliver'] = 'tryck ~INPUT_PICKUP~ för att sälja kycklingsförpackningen.', + ['s_unpackaged_button'] = 'tryck ~INPUT_PICKUP~ för att packa kycklingen.', + ['s_deliver'] = 'tryck ~INPUT_PICKUP~ för att sälja kycklingsförpackningar.', -- Dress Designer - ['dd_dress_locker'] = "Klädesdesigners Omklädningsrum", + ['dd_dress_locker'] = 'Klädesdesigners omklädningsrum', ['dd_wool'] = 'ull', - ['dd_pickup'] = 'tryck ~INPUT_PICKUP~ för att ta ullet.', + ['dd_pickup'] = 'tryck ~INPUT_PICKUP~ för att skörda ull.', ['dd_fabric'] = 'tyg', - ['dd_makefabric'] = 'tryck ~INPUT_PICKUP~ för att göra tyg.', - ['dd_clothing'] = 'kläder', + ['dd_makefabric'] = 'tryck ~INPUT_PICKUP~ för att framställa tyg.', + ['dd_clothing'] = 'plagg', ['dd_makeclothing'] = 'tryck ~INPUT_PICKUP~ för att hämta kläder.', - ['dd_deliver_clothes'] = 'tryck ~INPUT_PICKUP~ för att sälja kläder.', + ['dd_deliver_clothes'] = 'tryck ~INPUT_PICKUP~ för att sälja plagg.', } diff --git a/server/main.lua b/server/main.lua index 7f3c3ab2..ab3da8b6 100644 --- a/server/main.lua +++ b/server/main.lua @@ -36,7 +36,7 @@ AddEventHandler('esx_jobs:giveBackCautionInCaseOfDrop', function() account.removeMoney(caution) if caution > 0 then xPlayer.addAccountMoney('bank', caution) - TriggerClientEvent('esx:showNotification', _source, _U('bank_deposit_g').. caution .. _U('bank_deposit2')) + TriggerClientEvent('esx:showNotification', _source, _U('bank_deposit_returned', caution)) end end) end) @@ -111,14 +111,15 @@ end) RegisterServerEvent('esx_jobs:caution') AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle) local xPlayer = ESX.GetPlayerFromId(source) + if cautionType == "take" then xPlayer.removeAccountMoney('bank', cautionAmount) xPlayer.set('caution', cautionAmount) - TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_r') .. cautionAmount .. _U('caution_taken')) + TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_taken', cautionAmount)) TriggerClientEvent('esx_jobs:spawnJobVehicle', source, spawnPoint, vehicle) elseif cautionType == "give_back" then xPlayer.addAccountMoney('bank', cautionAmount) xPlayer.set('caution', 0) - TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_g') .. cautionAmount .. _U('caution_returned')) + TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_returned', cautionAmount)) end end)