From 0824c03d038633da456d34001652a7c22a2c7c3f Mon Sep 17 00:00:00 2001 From: Raoul <50175388+HariboInc@users.noreply.github.com> Date: Wed, 21 Sep 2022 22:50:41 +0200 Subject: [PATCH 01/12] refactor(esx_multicharacters): Dutch Translations --- [esx]/esx_multicharacter/locales/nl.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 [esx]/esx_multicharacter/locales/nl.lua diff --git a/[esx]/esx_multicharacter/locales/nl.lua b/[esx]/esx_multicharacter/locales/nl.lua new file mode 100644 index 00000000..4779bbae --- /dev/null +++ b/[esx]/esx_multicharacter/locales/nl.lua @@ -0,0 +1,25 @@ +Locales["nl"] = { + ["male"] = "Man", + ["female"] = "Vrouw", + ["delete_label"] = "Verwijder %s %s?", + ["select_char"] = "Kies Karakter", + ["create_char"] = "Creeër nieuw karakter", + ["char_play"] = "Speel dit karakter", + ["char_disabled"] = "Dit karakter is niet beschikbaar", + ["char_delete"] = "Verwijder dit karakter", + ["cancel"] = "Annuleer", + ["confirm"] = "Bevestig", + ["command_setslots"] = "Zet multicharacter aantal slots van een speler", + ["command_remslots"] = "Verwijder multicharacter aantal slots van een speler", + ["command_enablechar"] = "Zet een karakter van speler aan", + ["command_disablechar"] = "Zet een karakter van speler uit", + ["command_charslot"] = "Slot nummer van het karakter", + ["command_identifier"] = "Speler identifier", + ["command_slots"] = "# aantal slots", + ["slotsadd"] = "Je hebt %s aantal slots bij %s toegevoegd", + ["slotsedit"] = "Je hebt %s aantal slots bij %s aangepast", + ["slotsrem"] = "Je hebt slots bij %s verwijderd", + ["charenabled"] = "Je hebt karakter #%s van %s aangezet", + ["chardisabled"] = "Je hebt karakter #%s van %s uitgezet", + ["charnotfound"] = "Karakter #%s van %s bestaat niet", +} From d9bb3420c60aa3e40a4bcfb4da937f13e3a6e50b Mon Sep 17 00:00:00 2001 From: Raoul <50175388+HariboInc@users.noreply.github.com> Date: Wed, 21 Sep 2022 22:52:41 +0200 Subject: [PATCH 02/12] refactor(esx_weaponshop): Dutch Translations --- [esx_addons]/esx_weaponshop/locales/nl.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 [esx_addons]/esx_weaponshop/locales/nl.lua diff --git a/[esx_addons]/esx_weaponshop/locales/nl.lua b/[esx_addons]/esx_weaponshop/locales/nl.lua new file mode 100644 index 00000000..467b3323 --- /dev/null +++ b/[esx_addons]/esx_weaponshop/locales/nl.lua @@ -0,0 +1,13 @@ +Locales ['nl'] = { + ['buy_license'] = 'Koop een wapen vergunning?', + ['yes'] = '%s', + ['no'] = 'Nee', + ['weapon_bought'] = 'gekocht voor $%s', + ['not_enough_black'] = 'Je hebt niet genoeg zwart geld', + ['not_enough'] = 'je hebt niet genoeg geld', + ['already_owned'] = 'je hebt dit wapen al!', + ['shop_menu_title'] = 'Wapen winkel', + ['shop_menu_prompt'] = 'druk op [E] om de Wapen winkel te bezoeken.', + ['shop_menu_item'] = '$%s', + ['map_blip'] = 'Wapen winkel', +} From 7d1306f78c74a72c0dc079539d8a9e966b132566 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Thu, 22 Sep 2022 20:25:11 +0800 Subject: [PATCH 03/12] Update config.lua --- [esx_addons]/esx_basicneeds/config.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/[esx_addons]/esx_basicneeds/config.lua b/[esx_addons]/esx_basicneeds/config.lua index ce211543..321f472d 100644 --- a/[esx_addons]/esx_basicneeds/config.lua +++ b/[esx_addons]/esx_basicneeds/config.lua @@ -1,3 +1,17 @@ Config = {} Config.Locale = 'en' Config.Visible = true + +Config.Food = { + ["bread"] = { + status = 10000, + remove = false -- want the item to remove on use + } +} + +Config.Drinks = { + ["water"] = { + status = 10000, + remove = true -- want the item to remove on use + } +} From 5b7b0c89fa3e74d054825021c5571a59942384ff Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Thu, 22 Sep 2022 20:25:23 +0800 Subject: [PATCH 04/12] Update main.lua --- [esx_addons]/esx_basicneeds/server/main.lua | 40 +++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/server/main.lua b/[esx_addons]/esx_basicneeds/server/main.lua index b0de7997..5d420fa7 100644 --- a/[esx_addons]/esx_basicneeds/server/main.lua +++ b/[esx_addons]/esx_basicneeds/server/main.lua @@ -1,19 +1,29 @@ -ESX.RegisterUsableItem('bread', function(source) - local xPlayer = ESX.GetPlayerFromId(source) - xPlayer.removeInventoryItem('bread', 1) - - TriggerClientEvent('esx_status:add', source, 'hunger', 200000) - TriggerClientEvent('esx_basicneeds:onEat', source) - xPlayer.showNotification(_U('used_bread')) +CreateThread(function() + for k,v in pairs(Config.Food) do + ESX.RegisterUsableItem(k, function(source) + local xPlayer = ESX.GetPlayerFromId(source) + if v.remove then + xPlayer.removeInventoryItem(k,1) + end + TriggerClientEvent("esx_status:add",source,"hunger",v.status) + TriggerClientEvent('esx_basicneeds:onEat',source) + xPlayer.showNotification(_U('used_eat', ESX.GetItemLabel(k))) + end) + end end) -ESX.RegisterUsableItem('water', function(source) - local xPlayer = ESX.GetPlayerFromId(source) - xPlayer.removeInventoryItem('water', 1) - - TriggerClientEvent('esx_status:add', source, 'thirst', 200000) - TriggerClientEvent('esx_basicneeds:onDrink', source) - xPlayer.showNotification(_U('used_water')) +CreateThread(function() + for k,v in pairs(Config.Drink) do + ESX.RegisterUsableItem(k, function(source) + local xPlayer = ESX.GetPlayerFromId(source) + if v.remove then + xPlayer.removeInventoryItem(k,1) + end + TriggerClientEvent("esx_status:add",source,"thirst",v.status) + TriggerClientEvent('esx_basicneeds:onEat',source) + xPlayer.showNotification(_U('used_eat', ESX.GetItemLabel(k))) + end) + end end) ESX.RegisterCommand('heal', 'admin', function(xPlayer, args, showError) @@ -29,4 +39,4 @@ AddEventHandler('txAdmin:events:healedPlayer', function(eventData) end TriggerClientEvent('esx_basicneeds:healPlayer', eventData.id) -end) \ No newline at end of file +end) From bbc4c2d543841dd5b2d1be54a25585aa8aa56da6 Mon Sep 17 00:00:00 2001 From: Blxvyy <110262001+Blxvyy@users.noreply.github.com> Date: Thu, 22 Sep 2022 17:36:00 +0200 Subject: [PATCH 05/12] Update nl.lua --- [esx]/es_extended/locales/nl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/es_extended/locales/nl.lua b/[esx]/es_extended/locales/nl.lua index 8e3cd5eb..a4bbf30c 100644 --- a/[esx]/es_extended/locales/nl.lua +++ b/[esx]/es_extended/locales/nl.lua @@ -48,7 +48,7 @@ Locales['nl'] = { ['bank'] = 'Doolhofbank', ['account_bank'] = 'Bank', ['account_black_money'] = 'Zwart geld', - ['account_money'] = 'Cash', + ['account_money'] = 'Geld', ['act_imp'] = 'Kan actie niet uitvoeren', ['in_vehicle'] = 'Kan actie niet uitvoeren, speler zit in voertuig', From 665376aeb9812b09329e8dc519f2770ce8c06fe7 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:06:52 +0800 Subject: [PATCH 06/12] Update main.lua --- [esx_addons]/esx_basicneeds/server/main.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/server/main.lua b/[esx_addons]/esx_basicneeds/server/main.lua index 5d420fa7..5fed3e92 100644 --- a/[esx_addons]/esx_basicneeds/server/main.lua +++ b/[esx_addons]/esx_basicneeds/server/main.lua @@ -13,15 +13,15 @@ CreateThread(function() end) CreateThread(function() - for k,v in pairs(Config.Drink) do + for k,v in pairs(Config.Drinks) do ESX.RegisterUsableItem(k, function(source) local xPlayer = ESX.GetPlayerFromId(source) if v.remove then xPlayer.removeInventoryItem(k,1) end TriggerClientEvent("esx_status:add",source,"thirst",v.status) - TriggerClientEvent('esx_basicneeds:onEat',source) - xPlayer.showNotification(_U('used_eat', ESX.GetItemLabel(k))) + TriggerClientEvent('esx_basicneeds:onDrink',source) + xPlayer.showNotification(_U('used_drink', ESX.GetItemLabel(k))) end) end end) From b13caf9e2af362adf65fe6beaf0c918d3ef3acbf Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:07:14 +0800 Subject: [PATCH 07/12] Update config.lua --- [esx_addons]/esx_basicneeds/config.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/config.lua b/[esx_addons]/esx_basicneeds/config.lua index 321f472d..a0b9fb0e 100644 --- a/[esx_addons]/esx_basicneeds/config.lua +++ b/[esx_addons]/esx_basicneeds/config.lua @@ -4,14 +4,14 @@ Config.Visible = true Config.Food = { ["bread"] = { - status = 10000, - remove = false -- want the item to remove on use + status = 200000, + remove = false } } Config.Drinks = { ["water"] = { - status = 10000, - remove = true -- want the item to remove on use + status = 100000, + remove = true } } From b7eb31df056a7b32ccaf5d0c9b2b0e7dce3151f8 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:09:21 +0800 Subject: [PATCH 08/12] Update en.lua --- [esx_addons]/esx_basicneeds/locales/en.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/locales/en.lua b/[esx_addons]/esx_basicneeds/locales/en.lua index 3d03856d..a84b4c38 100644 --- a/[esx_addons]/esx_basicneeds/locales/en.lua +++ b/[esx_addons]/esx_basicneeds/locales/en.lua @@ -1,4 +1,4 @@ Locales['en'] = { - ['used_bread'] = 'you have used 1x bread', - ['used_water'] = 'you have used 1x water', -} \ No newline at end of file + ['used_eat'] = 'you have used 1x %s', + ['used_drink'] = 'you have used 1x %s', +} From 3cc4c198b98e90178609e87c525d503a1fbd5206 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:09:50 +0800 Subject: [PATCH 09/12] Update br.lua --- [esx_addons]/esx_basicneeds/locales/br.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/locales/br.lua b/[esx_addons]/esx_basicneeds/locales/br.lua index e263e11a..2f023c30 100644 --- a/[esx_addons]/esx_basicneeds/locales/br.lua +++ b/[esx_addons]/esx_basicneeds/locales/br.lua @@ -1,4 +1,4 @@ Locales['br'] = { - ['used_bread'] = 'você comeu 1x pão', - ['used_water'] = 'você tomou 1x água', -} \ No newline at end of file + ['used_eat'] = 'você comeu 1x %s', + ['used_drink'] = 'você tomou 1x %s', +} From 4653009a85419bee404c9f6c94c1c819a6b47e58 Mon Sep 17 00:00:00 2001 From: SzXna <70284308+SzXna@users.noreply.github.com> Date: Sat, 24 Sep 2022 18:34:41 +0200 Subject: [PATCH 10/12] Create pl.lua --- [esx_addons]/esx_allowlist/locales/pl.lua | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 [esx_addons]/esx_allowlist/locales/pl.lua diff --git a/[esx_addons]/esx_allowlist/locales/pl.lua b/[esx_addons]/esx_allowlist/locales/pl.lua new file mode 100644 index 00000000..686f6661 --- /dev/null +++ b/[esx_addons]/esx_allowlist/locales/pl.lua @@ -0,0 +1,8 @@ +Locales['pl'] = { + ['allowlist_check'] = 'Sprawdzamy, czy jesteś na Allowlist.', + ['not_allowlisted'] = 'Aby dołączyć do tego serwera, musisz być na Allowlist!', + ['allowlist_empty'] = 'Brak zapisanych list Allowlist dla tego serwera.', + ['license_missing'] = 'Błąd: Brak ID!', + ['help_allowlist_add'] = 'dodaj do allowlist', + ['help_allowlist_load'] = 'przeładuj allowlist', +} From a9e4bca80efee01109e0085da28cb4d6b08bf51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Nagy?= Date: Sun, 25 Sep 2022 14:51:09 +0200 Subject: [PATCH 11/12] Fix onesync.lua coords variables Fixes the Invalid Lua type error. ``` SCRIPT ERROR: Invalid Lua type in __data > fn (@es_extended/server/onesync.lua:91) ``` --- [esx]/es_extended/server/onesync.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx]/es_extended/server/onesync.lua b/[esx]/es_extended/server/onesync.lua index 2947f80a..5c9784c7 100644 --- a/[esx]/es_extended/server/onesync.lua +++ b/[esx]/es_extended/server/onesync.lua @@ -65,7 +65,7 @@ end function ESX.OneSync.SpawnVehicle(model, coords, heading, autoMobile, Properties, cb) model = type(model) == 'string' and joaat(model) or model Properties = Properties or {} - local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z) + local coords = type(coords) == "vector3" and coords or vector3(coords.x, coords.y, coords.z) if type(autoMobile) ~= 'boolean' then return end @@ -86,7 +86,7 @@ end ---@param cb function function ESX.OneSync.SpawnObject(model, coords, heading, cb) if type(model) == 'string' then model = joaat(model) end - local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z) + local coords = type(coords) == "vector3" and coords or vector3(coords.x, coords.y, coords.z) CreateThread(function() local entity = CreateObject(model, coords, true, true) while not DoesEntityExist(entity) do Wait(50) end From 1f000934ae79d4ba0acafbd13aa252f1b045aa42 Mon Sep 17 00:00:00 2001 From: xorzo <80540494+xorzo1@users.noreply.github.com> Date: Sun, 25 Sep 2022 18:50:08 +0200 Subject: [PATCH 12/12] feat(dutch language) dutch lang support for esx_drugs. --- [esx_addons]/esx_drugs/locales/nl.lua | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 [esx_addons]/esx_drugs/locales/nl.lua diff --git a/[esx_addons]/esx_drugs/locales/nl.lua b/[esx_addons]/esx_drugs/locales/nl.lua new file mode 100644 index 00000000..479c521a --- /dev/null +++ b/[esx_addons]/esx_drugs/locales/nl.lua @@ -0,0 +1,31 @@ +Locales ['nl'] = { + -- weed + ['weed_pickupprompt'] = 'druk op [E] om de Cannabis plant te oogsten.', + ['weed_quitprocess'] = 'druk op [E] om Proces Cannabis te stoppen.', + ['weed_inventoryfull'] = 'heb je geen voorraadruimte meer voor Cannabis.', + ['weed_processprompt'] = 'druk op [E] om Proces Cannabis te starten.', + ['weed_processingstarted'] = 'Cannabis verwerken tot marihuana...', + ['weed_processingfull'] = 'verwerking ~r~geannuleerd wegens volle voorraad!', + ['weed_processingenough'] = 'u moet 3x Cannabis hebben om te kunnen verwerken.', + ['weed_processed'] = 'je hebt 3x Cannabis verwerkt tot 1x Marihuana', + ['weed_processingtoofar'] = 'het proces is geannuleerd omdat u het gebied verlaten heeft.', + + -- drug dealer + ['dealer_prompt'] = 'druk op [E] om met de ~r~Drugs Dealer te praten.', + ['dealer_title'] = 'drugsdealer', + ['dealer_item'] = '$%s', + ['dealer_notenough'] = 'heb je daar niet genoeg van om te verkopen!', + ['dealer_sold'] = 'je hebt %sx %s verkocht voor $%s', + + -- license + ['license_title'] = 'u moet een verwerkingsvergunning hebben om dit product te verwerken, die kunt u hier kopen.', + ['license_no'] = 'nee', + ['license_bought'] = 'je kocht de %s voor ~r~$%s', + ['license_bought_fail'] = 'je kunt je geen %s veroorloven!', + ['license_weed'] = 'Licentie voor wietverwerking', + + -- blips + ['blip_weedfield'] = 'onkruidveld', + ['blip_weedprocessing'] = 'onkruidverwerking', + ['blip_drugdealer'] = 'drugsdealer', +}