From 1d0489b04348473353b7eb35bcbe5eed1f18cd54 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 25 Apr 2018 19:44:47 +0200 Subject: [PATCH] i18n updates --- client/main.lua | 10 +++++----- locales/de.lua | 35 +++++++++++++-------------------- locales/en.lua | 35 +++++++++++++-------------------- locales/fr.lua | 35 +++++++++++++-------------------- locales/sv.lua | 11 +++++------ server/main.lua | 51 +++++++++++++++++++++---------------------------- 6 files changed, 71 insertions(+), 106 deletions(-) diff --git a/client/main.lua b/client/main.lua index c69eb41e..a9e60aa5 100644 --- a/client/main.lua +++ b/client/main.lua @@ -65,7 +65,7 @@ AddEventHandler('esx_holdup:setblip', function(position) end) RegisterNetEvent('esx_holdup:toofarlocal') -AddEventHandler('esx_holdup:toofarlocal', function(robb) +AddEventHandler('esx_holdup:toofarlocal', function() holdingup = false ESX.ShowNotification(_U('robbery_cancelled')) robbingName = "" @@ -74,16 +74,16 @@ end) RegisterNetEvent('esx_holdup:robberycomplete') -AddEventHandler('esx_holdup:robberycomplete', function(robb) +AddEventHandler('esx_holdup:robberycomplete', function(award) holdingup = false - ESX.ShowNotification(_U('robbery_complete')) + ESX.ShowNotification(_U('robbery_complete', award)) store = "" incircle = false end) RegisterNetEvent('esx_holdup:starttimer') -AddEventHandler('esx_holdup:starttimer', function(source) +AddEventHandler('esx_holdup:starttimer', function() timer = Stores[store].secondsRemaining Citizen.CreateThread(function() while timer > 0 do @@ -136,7 +136,7 @@ Citizen.CreateThread(function() if(Vdist(pos.x, pos.y, pos.z, pos2.x, pos2.y, pos2.z) < 1.0)then if (incircle == false) then - DisplayHelpText(_U('press_to_rob') .. v.nameofstore) + DisplayHelpText(_U('press_to_rob', v.nameofstore)) end incircle = true if IsControlJustReleased(0, Keys['E']) then diff --git a/locales/de.lua b/locales/de.lua index 10d2faa4..3c94a9b7 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,24 +1,15 @@ Locales['de'] = { - - ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', - ['robbery_successful'] = 'Raub erfolgreich du erbeutest ~g~$', - ['shop_robbery'] = 'Ladenraub', - ['press_to_rob'] = 'Drücke ~INPUT_CONTEXT~ zum ausrauben ~b~', - ['robbery_of'] = 'Ladenraub: ~r~', - ['seconds_remaining'] = '~w~ sekunden übrig', - ['robbery_cancelled_at'] = '~r~ Raub abgebrochen bei: ~b~', - ['robbery_has_cancelled'] = '~r~ Raub wurde abgebrochen: ~b~', - ['already_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte: ', - ['seconds'] = 'sekunden.', - ['rob_in_prog'] = '~r~ Raub im gange bei: ~b~', - ['started_to_rob'] = 'du hast einen Raub gestartet ~b~', - ['do_not_move'] = '~s~, laufe nicht weg!', - ['alarm_triggered'] = 'der Alarm wurde ausgelöst', - ['hold_pos'] = 'halte 5 Minuten lang durch, und die Beute gehört dir!', - ['robbery_complete'] = '~r~ Raub erfolgreich.~s~ ~h~ LAUF!', - ['robbery_complete_at'] = '~r~ Raub erfolgreich bei: ~b~', - ['min_police'] = 'there must be at least ~b~', - ['in_city'] = '~s~ policemen in town to rob.', - ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', - + ['shop_robbery'] = 'ladenraub', + ['press_to_rob'] = 'drücke ~INPUT_CONTEXT~ ~o~zum ausrauben~s~ ~b~%s~s~', + ['robbery_timer'] = 'ladenraub: ~r~%s~s~ sekunden übrig!', + ['recently_robbed'] = 'dieser Laden wurde bereits ausgeraubt. Bitte warte ~y~%s~s~ sekunden!', + ['rob_in_prog'] = '~r~Raub im gange bei: ~b~%s~s~', + ['started_to_rob'] = 'du hast einen Raub gestartet ~y~%s~s~', + ['alarm_triggered'] = 'der Alarm wurde ausgelöst', + ['robbery_complete'] = '~r~Raub erfolgreich.~s~ Du ~o~hast gestohlen~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Raub erfolgreich bei: ~y~%s~s~', + ['robbery_cancelled'] = 'der Raub wurde abgebrochen, du bekommst nichts!', + ['robbery_cancelled_at'] = '~r~Raub abgebrochen bei: ~b~%s~s~', + ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', + ['robbery_already'] = '~r~Ein Raub ist bereits im gange.', } diff --git a/locales/en.lua b/locales/en.lua index cbf6cb25..a8b1f3fc 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,24 +1,15 @@ Locales['en'] = { - - ['robbery_cancelled'] = 'the robbery will be cancelled, you will gain nothing!', - ['robbery_successful'] = 'successful robbery you have gained ~g~$', - ['shop_robbery'] = 'shop Robbery', - ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to rob ~b~', - ['robbery_of'] = 'store robbery: ~r~', - ['seconds_remaining'] = '~w~ seconds remaning', - ['robbery_cancelled_at'] = '~r~ Robbery cancelled at: ~b~', - ['robbery_has_cancelled'] = '~r~ robbery has been cancelled: ~b~', - ['already_robbed'] = 'this store has already been robbed. Please wait: ', - ['seconds'] = 'seconds.', - ['rob_in_prog'] = '~r~ robbery in progress at: ~b~', - ['started_to_rob'] = 'you started to rob ~b~', - ['do_not_move'] = '~s~, do not move away!', - ['alarm_triggered'] = 'the alarm has been triggered', - ['hold_pos'] = 'hold for 5 minutes and the money is yours!', - ['robbery_complete'] = '~r~ Robbery complete.~s~ ~h~ Run!', - ['robbery_complete_at'] = '~r~ Robbery complete at: ~b~', - ['min_police'] = 'there must be at least ~b~', - ['in_city'] = '~s~ policemen in town to rob.', - ['robbery_already'] = '~r~A robbery is already in progress.', - + ['shop_robbery'] = 'shop Robbery', + ['press_to_rob'] = 'press ~INPUT_CONTEXT~ to ~o~rob~s~ ~b~%s~s~', + ['robbery_timer'] = 'store robbery: ~r~%s~s~ seconds remaning', + ['recently_robbed'] = 'this store was recently been robbed. Please wait ~y~%s~s~ seconds until you can rob again', + ['rob_in_prog'] = '~r~robbery in progress at ~b~%s~s~', + ['started_to_rob'] = 'you started to rob ~y~%s~s~', + ['alarm_triggered'] = 'the alarm has been triggered', + ['robbery_complete'] = '~r~The robbery has been successful~s~, you ~o~stole~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Robbery successful at ~y~%s~s~', + ['robbery_cancelled'] = 'the robbery has been cancelled!', + ['robbery_cancelled_at'] = '~r~The robbery at ~b~%s~s~ has been cancelled!', + ['min_police'] = 'there must be at least ~b~%s cops~s~ in town to rob.', + ['robbery_already'] = '~r~A robbery is already in progress.', } diff --git a/locales/fr.lua b/locales/fr.lua index 3bf3db32..9adff5b9 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,24 +1,15 @@ Locales['fr'] = { - - ['robbery_cancelled'] = 'Le braquage va être annulé, vous ne gagnerez rien !', - ['robbery_successful'] = 'Braquage réussi, vous avez gagné ~g~$', - ['shop_robbery'] = 'Braquage magasin', - ['press_to_rob'] = 'Appuyez sur ~INPUT_CONTEXT~ pour braquer ~b~', - ['robbery_of'] = 'Braquage de magasin :\n ~r~', - ['seconds_remaining'] = '~w~ secondes restantes', - ['robbery_cancelled_at'] = '~r~ Braquage annulé à: ~b~', - ['robbery_has_cancelled'] = '~r~ Le braquage à été annulé: ~b~', - ['already_robbed'] = 'Ce magasin a déjà été braqué. Attendez ~r~ ', - ['seconds'] = '~b~ secondes.', - ['rob_in_prog'] = '~r~ Braquage en cours à: ~b~', - ['started_to_rob'] = 'Vous avez commencé à braquer ~b~', - ['do_not_move'] = '~s~, ne vous éloignez pas !', - ['alarm_triggered'] = 'l\'alarme a été déclenchée', - ['hold_pos'] = 'Tenez la position et l\'argent sera à vous !', - ['robbery_complete'] = '~r~ Braquage terminé.~s~ ~h~ Cours petite fille !', - ['robbery_complete_at'] = '~r~ Braquage terminé à : ~b~', - ['min_police'] = 'Il faut minimum ~b~', - ['in_city'] = '~s~ policiers en ville pour braquer.', - ['robbery_already'] = '~r~Un braquage est déjà en cours.', - + ['shop_robbery'] = 'braquage magasin', + ['press_to_rob'] = 'appuyez sur ~INPUT_CONTEXT~ ~o~pour braquer~s~ ~b~%s~s~', + ['robbery_timer'] = 'braquage magasin: il reste ~r~%s~s~ secondes', + ['recently_robbed'] = 'ce magasin a déjà été braqué. Attendez ~r~%s~b~ secondes.', + ['rob_in_prog'] = '~r~Braquage en cours à: ~b~%s~s~', + ['started_to_rob'] = 'vous avez commencé à braquer ~b~%s~s~', + ['alarm_triggered'] = 'l\'alarme a été déclenchée', + ['robbery_complete'] = '~r~Braquage terminé~s~. Vous avez ~o~volé~s~ ~g~$%s~s~', + ['robbery_complete_at'] = '~r~Braquage terminé à: ~b~%s~s~', + ['robbery_cancelled'] = 'le braquage va être annulé, vous ne gagnerez rien!', + ['robbery_cancelled_at'] = '~r~Braquage annulé à: ~b~%s~s~', + ['min_police'] = 'il faut minimum ~b~%s policiers~s~ en ville pour braquer.', + ['robbery_already'] = '~r~Un braquage est déjà en cours.', } diff --git a/locales/sv.lua b/locales/sv.lua index 7e9fba1d..2d0bc9cd 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,16 +1,15 @@ Locales['sv'] = { - ['robbery_cancelled'] = 'rånet har avbryts, spring nu!', - ['shop_robbery'] = 'råna butik', - ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att råna ~b~', + ['shop_robbery'] = 'butikrån', + ['press_to_rob'] = 'tryck ~INPUT_CONTEXT~ för att ~o~råna~s~ ~b~%s~s~', ['robbery_timer'] = 'butiksrån: ~r~%s~s~ sekunder kvarstår', - ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrytits!', ['recently_robbed'] = 'denna butik har nyligen rånats, du måste vänta ~y~%s~s~ sekunder!', ['rob_in_prog'] = '~r~Det är ett pågående rån vid ~b~%s~s~', ['started_to_rob'] = 'du började att råna ~y~%s~s~, gå inte för långt från butiken!', ['alarm_triggered'] = '~o~Larmet har utlösts~s~', - ['hold_pos'] = 'vänta 5 minuter och pengarna är dina!', - ['robbery_complete'] = '~r~Rånet är avklarat~s~, förlora polisen!', + ['robbery_complete'] = '~r~Rånet är avklarat~s~, du stal ~g~$%s~s~!', ['robbery_complete_at'] = '~r~Ett rån lyckades~s~ vid ~y~%s~s~', + ['robbery_cancelled'] = 'rånet har avbrutits!', + ['robbery_cancelled_at'] = '~r~Rånet~s~ vid ~b~%s~s~ har avbrutits!', ['min_police'] = 'det måste vara minst ~b~%s poliser~s~ inne för att du ska kunna ~o~råna butiker~s~.', ['robbery_already'] = '~r~Ett rån pågår redan.', } \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index a1066cee..ca6fb91d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -10,13 +10,14 @@ AddEventHandler('esx_holdup:toofar', function(robb) local xPlayers = ESX.GetPlayers() rob = false for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + + if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at', Stores[robb].nameofstore)) TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) end end - if(robbers[_source])then + if robbers[_source] then TriggerClientEvent('esx_holdup:toofarlocal', _source) robbers[_source] = nil TriggerClientEvent('esx:showNotification', _source, _U('robbery_cancelled_at', Stores[robb].nameofstore)) @@ -25,70 +26,62 @@ end) RegisterServerEvent('esx_holdup:rob') AddEventHandler('esx_holdup:rob', function(robb) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) local xPlayers = ESX.GetPlayers() if Stores[robb] then - local store = Stores[robb] if (os.time() - store.lastrobbed) < Config.TimerBeforeNewRob and store.lastrobbed ~= 0 then - TriggerClientEvent('esx:showNotification', _source, _U('recently_robbed', Config.TimerBeforeNewRob - (os.time() - store.lastrobbed))) return end - local cops = 0 for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then cops = cops + 1 end end - if rob == false then - - if(cops >= Config.PoliceNumberRequired)then - + if cops >= Config.PoliceNumberRequired then rob = true for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameofstore)) - TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameofstore)) + TriggerClientEvent('esx_holdup:setblip', xPlayers[i], Stores[robb].position) end end TriggerClientEvent('esx:showNotification', _source, _U('started_to_rob', store.nameofstore)) TriggerClientEvent('esx:showNotification', _source, _U('alarm_triggered')) - TriggerClientEvent('esx:showNotification', _source, _U('hold_pos')) TriggerClientEvent('esx_holdup:currentlyrobbing', _source, robb) TriggerClientEvent('esx_holdup:starttimer', _source) - Stores[robb].lastrobbed = os.time() robbers[_source] = robb local savedSource = _source SetTimeout(store.secondsRemaining * 1000, function() - if(robbers[savedSource])then - + if robbers[savedSource] then rob = false - TriggerClientEvent('esx_holdup:robberycomplete', savedSource, job) - if(xPlayer)then - - xPlayer.addAccountMoney('black_money', store.reward) + if xPlayer then + local award = store.reward + + TriggerClientEvent('esx_holdup:robberycomplete', savedSource, reward) + xPlayer.addAccountMoney('black_money', reward) + local xPlayers = ESX.GetPlayers() for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameofstore)) - TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + if xPlayer.job.name == 'police' then + TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameofstore)) + TriggerClientEvent('esx_holdup:killblip', xPlayers[i]) end end end