From f665fc2c7feaf214eff002e860b281688e79be9a Mon Sep 17 00:00:00 2001 From: Csoki Date: Thu, 15 Sep 2022 00:23:24 +0200 Subject: [PATCH] change all Config.locale to convar --- [esx]/es_extended/config.lua | 2 +- [esx]/esx_identity/config.lua | 2 +- [esx]/esx_multicharacter/config.lua | 2 +- [esx]/esx_skin/config.lua | 2 +- [esx]/skinchanger/config.lua | 2 +- [esx_addons]/esx_accessories/config.lua | 2 +- [esx_addons]/esx_allowlist/config.lua | 2 +- [esx_addons]/esx_ambulancejob/config.lua | 2 +- [esx_addons]/esx_bankerjob/config.lua | 2 +- [esx_addons]/esx_barbershop/config.lua | 2 +- [esx_addons]/esx_basicneeds/config.lua | 2 +- [esx_addons]/esx_billing/config.lua | 2 +- [esx_addons]/esx_boat/config.lua | 2 +- [esx_addons]/esx_clotheshop/config.lua | 2 +- [esx_addons]/esx_cruisecontrol/config.lua | 2 +- [esx_addons]/esx_dmvschool/config.lua | 2 +- [esx_addons]/esx_drugs/config.lua | 2 +- [esx_addons]/esx_garage/config.lua | 2 +- [esx_addons]/esx_holdup/config.lua | 2 +- [esx_addons]/esx_joblisting/config.lua | 2 +- [esx_addons]/esx_jobs/config.lua | 2 +- [esx_addons]/esx_lscustom/config.lua | 2 +- [esx_addons]/esx_mechanicjob/config.lua | 2 +- [esx_addons]/esx_optionalneeds/config.lua | 2 +- [esx_addons]/esx_phone/config.lua | 2 +- [esx_addons]/esx_policejob/config.lua | 2 +- [esx_addons]/esx_property/config.lua | 2 +- [esx_addons]/esx_rpchat/config.lua | 2 +- [esx_addons]/esx_shops/config.lua | 2 +- [esx_addons]/esx_society/config.lua | 2 +- [esx_addons]/esx_taxijob/config.lua | 2 +- [esx_addons]/esx_vehicleshop/config.lua | 2 +- [esx_addons]/esx_weaponshop/config.lua | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua index 15292053..438c2711 100644 --- a/[esx]/es_extended/config.lua +++ b/[esx]/es_extended/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Accounts = { bank = { diff --git a/[esx]/esx_identity/config.lua b/[esx]/esx_identity/config.lua index 3cabbda0..8cdd9bb7 100644 --- a/[esx]/esx_identity/config.lua +++ b/[esx]/esx_identity/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') -- [Config.EnableCommands] -- Enables Commands Such As /char and /chardel diff --git a/[esx]/esx_multicharacter/config.lua b/[esx]/esx_multicharacter/config.lua index d9f35a24..6ceb7dc6 100644 --- a/[esx]/esx_multicharacter/config.lua +++ b/[esx]/esx_multicharacter/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') -- Allows players to delete their characters Config.CanDelete = true diff --git a/[esx]/esx_skin/config.lua b/[esx]/esx_skin/config.lua index d4b4415d..0c547956 100644 --- a/[esx]/esx_skin/config.lua +++ b/[esx]/esx_skin/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.BackpackWeight = { [40] = 16, diff --git a/[esx]/skinchanger/config.lua b/[esx]/skinchanger/config.lua index a7437122..0e5e1590 100644 --- a/[esx]/skinchanger/config.lua +++ b/[esx]/skinchanger/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Components = {{ label = _U('sex'), diff --git a/[esx_addons]/esx_accessories/config.lua b/[esx_addons]/esx_accessories/config.lua index 543c13a9..2cf115df 100644 --- a/[esx_addons]/esx_accessories/config.lua +++ b/[esx_addons]/esx_accessories/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Price = 100 diff --git a/[esx_addons]/esx_allowlist/config.lua b/[esx_addons]/esx_allowlist/config.lua index e0e3f02d..2dadfb4e 100644 --- a/[esx_addons]/esx_allowlist/config.lua +++ b/[esx_addons]/esx_allowlist/config.lua @@ -1,4 +1,4 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.MinPlayer = 10 --Set how many players need to be connect before whitelist start, 0-32 diff --git a/[esx_addons]/esx_ambulancejob/config.lua b/[esx_addons]/esx_ambulancejob/config.lua index c89bb286..ea35aa8f 100644 --- a/[esx_addons]/esx_ambulancejob/config.lua +++ b/[esx_addons]/esx_ambulancejob/config.lua @@ -8,7 +8,7 @@ Config.ReviveReward = 700 -- Revive reward, set to 0 if you don't Config.SaveDeathStatus = true -- Save Death Status? Config.LoadIpl = true -- Disable if you're using fivem-ipl or other IPL loaders -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.DistressBlip = { Sprite = 310, diff --git a/[esx_addons]/esx_bankerjob/config.lua b/[esx_addons]/esx_bankerjob/config.lua index 6db499a7..9e26ffe1 100644 --- a/[esx_addons]/esx_bankerjob/config.lua +++ b/[esx_addons]/esx_bankerjob/config.lua @@ -1,7 +1,7 @@ Config = {} Config.DrawDistance = 10.0 Config.BankSavingPercentage = 2.5 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Zones = { BankActions = { diff --git a/[esx_addons]/esx_barbershop/config.lua b/[esx_addons]/esx_barbershop/config.lua index f2f0217f..6a25a3ab 100644 --- a/[esx_addons]/esx_barbershop/config.lua +++ b/[esx_addons]/esx_barbershop/config.lua @@ -7,7 +7,7 @@ Config.MarkerSize = vector3(1.5, 1.5, 1.0) Config.MarkerColor = {r = 102, g = 102, b = 204} Config.MarkerType = 1 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Shops = { vector3(-814.3, -183.8, 36.6), diff --git a/[esx_addons]/esx_basicneeds/config.lua b/[esx_addons]/esx_basicneeds/config.lua index ce211543..0a84e6c0 100644 --- a/[esx_addons]/esx_basicneeds/config.lua +++ b/[esx_addons]/esx_basicneeds/config.lua @@ -1,3 +1,3 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Visible = true diff --git a/[esx_addons]/esx_billing/config.lua b/[esx_addons]/esx_billing/config.lua index 5290495d..f6c6c4d9 100644 --- a/[esx_addons]/esx_billing/config.lua +++ b/[esx_addons]/esx_billing/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') diff --git a/[esx_addons]/esx_boat/config.lua b/[esx_addons]/esx_boat/config.lua index 8381f311..c274b201 100644 --- a/[esx_addons]/esx_boat/config.lua +++ b/[esx_addons]/esx_boat/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.LicenseEnable = true -- enable boat license? Requires esx_license Config.LicensePrice = 50000 diff --git a/[esx_addons]/esx_clotheshop/config.lua b/[esx_addons]/esx_clotheshop/config.lua index f7ef9cc3..976431e9 100644 --- a/[esx_addons]/esx_clotheshop/config.lua +++ b/[esx_addons]/esx_clotheshop/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Price = 250 diff --git a/[esx_addons]/esx_cruisecontrol/config.lua b/[esx_addons]/esx_cruisecontrol/config.lua index c8214b09..b5c9d8f1 100644 --- a/[esx_addons]/esx_cruisecontrol/config.lua +++ b/[esx_addons]/esx_cruisecontrol/config.lua @@ -1,4 +1,4 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.ToggleKey = "CAPITAL" diff --git a/[esx_addons]/esx_dmvschool/config.lua b/[esx_addons]/esx_dmvschool/config.lua index b817bdf2..fae80a6d 100644 --- a/[esx_addons]/esx_dmvschool/config.lua +++ b/[esx_addons]/esx_dmvschool/config.lua @@ -2,7 +2,7 @@ Config = {} Config.DrawDistance = 10.0 Config.MaxErrors = 5 Config.SpeedMultiplier = 3.6 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Prices = { dmv = 500, diff --git a/[esx_addons]/esx_drugs/config.lua b/[esx_addons]/esx_drugs/config.lua index 7f2fc185..fa3b19a7 100644 --- a/[esx_addons]/esx_drugs/config.lua +++ b/[esx_addons]/esx_drugs/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Delays = { WeedProcessing = 1000 * 7 diff --git a/[esx_addons]/esx_garage/config.lua b/[esx_addons]/esx_garage/config.lua index 0ed3ec66..e4b3e20a 100644 --- a/[esx_addons]/esx_garage/config.lua +++ b/[esx_addons]/esx_garage/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = "en" +Config.Locale = GetConvar('esx:locale', 'en') Config.DrawDistance = 10.0 diff --git a/[esx_addons]/esx_holdup/config.lua b/[esx_addons]/esx_holdup/config.lua index 5074bebd..9ea2d292 100644 --- a/[esx_addons]/esx_holdup/config.lua +++ b/[esx_addons]/esx_holdup/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Marker = { r = 250, g = 0, b = 0, a = 100, -- red color diff --git a/[esx_addons]/esx_joblisting/config.lua b/[esx_addons]/esx_joblisting/config.lua index 6e41cba7..5434d6a8 100644 --- a/[esx_addons]/esx_joblisting/config.lua +++ b/[esx_addons]/esx_joblisting/config.lua @@ -7,7 +7,7 @@ Config.MarkerType = 27 Config.Debug = ESX.GetConfig().EnableDebug -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Zones = { vector3(-265.08, -964.1, 30.3) diff --git a/[esx_addons]/esx_jobs/config.lua b/[esx_addons]/esx_jobs/config.lua index 5fd0ae9a..8ce5141d 100644 --- a/[esx_addons]/esx_jobs/config.lua +++ b/[esx_addons]/esx_jobs/config.lua @@ -1,6 +1,6 @@ Config = {} Config.DrawDistance = 10.0 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Jobs = {} Config.MaxCaution = 10000 -- the max caution allowed diff --git a/[esx_addons]/esx_lscustom/config.lua b/[esx_addons]/esx_lscustom/config.lua index 927360ed..13d4eb07 100644 --- a/[esx_addons]/esx_lscustom/config.lua +++ b/[esx_addons]/esx_lscustom/config.lua @@ -1,6 +1,6 @@ Config = {} Config.DrawDistance = 10.0 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.IsMechanicJobOnly = false Config.Zones = { diff --git a/[esx_addons]/esx_mechanicjob/config.lua b/[esx_addons]/esx_mechanicjob/config.lua index e8dc1dff..776b9355 100644 --- a/[esx_addons]/esx_mechanicjob/config.lua +++ b/[esx_addons]/esx_mechanicjob/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.DrawDistance = 10.0 -- How close you need to be in order for the markers to be drawn (in GTA units). Config.MaxInService = -1 diff --git a/[esx_addons]/esx_optionalneeds/config.lua b/[esx_addons]/esx_optionalneeds/config.lua index 6dd9f689..0dea84dc 100644 --- a/[esx_addons]/esx_optionalneeds/config.lua +++ b/[esx_addons]/esx_optionalneeds/config.lua @@ -2,4 +2,4 @@ Config = {} Config.TickTime = 100 Config.UpdateClientTime = 5000 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') diff --git a/[esx_addons]/esx_phone/config.lua b/[esx_addons]/esx_phone/config.lua index 5290495d..f6c6c4d9 100644 --- a/[esx_addons]/esx_phone/config.lua +++ b/[esx_addons]/esx_phone/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') diff --git a/[esx_addons]/esx_policejob/config.lua b/[esx_addons]/esx_policejob/config.lua index a56469d5..7fa6b8d8 100644 --- a/[esx_addons]/esx_policejob/config.lua +++ b/[esx_addons]/esx_policejob/config.lua @@ -20,7 +20,7 @@ Config.EnableCustomPeds = false -- Enable custom peds in cloak room? S Config.EnableESXService = false -- Enable esx service? Config.MaxInService = -1 -- How many people can be in service at once? Set as -1 to have no limit -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.OxInventory = ESX.GetConfig().OxInventory diff --git a/[esx_addons]/esx_property/config.lua b/[esx_addons]/esx_property/config.lua index 9cbe598d..b4edac7f 100644 --- a/[esx_addons]/esx_property/config.lua +++ b/[esx_addons]/esx_property/config.lua @@ -6,7 +6,7 @@ Config.OwnedBlips = true -- Add blips for Owned Properties --------------------------------------------------------------- --------------------- General Settings --------------------------------- -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Shells = false -- Enable/Disable Shell Interiors Default: false Config.SaveInterval = 5 -- Interval in Minutes to Save Properties Config.CanAlwaysExit = true -- Disabling this allows players to be locked in diff --git a/[esx_addons]/esx_rpchat/config.lua b/[esx_addons]/esx_rpchat/config.lua index f3509048..2e081cb2 100644 --- a/[esx_addons]/esx_rpchat/config.lua +++ b/[esx_addons]/esx_rpchat/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.OnlyFirstname = false Config.EnableESXIdentity = true -- RP names diff --git a/[esx_addons]/esx_shops/config.lua b/[esx_addons]/esx_shops/config.lua index b6a31d1c..07705f55 100644 --- a/[esx_addons]/esx_shops/config.lua +++ b/[esx_addons]/esx_shops/config.lua @@ -3,7 +3,7 @@ Config.DrawDistance = 7.5 Config.MarkerSize = {x = 1.1, y = 0.7, z = 1.1} Config.MarkerType = 29 Config.MarkerColor = {r = 50, g = 200, b = 50, a = 200} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.Zones = { diff --git a/[esx_addons]/esx_society/config.lua b/[esx_addons]/esx_society/config.lua index b81490cb..391b3226 100644 --- a/[esx_addons]/esx_society/config.lua +++ b/[esx_addons]/esx_society/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.EnableESXIdentity = true Config.MaxSalary = 3500 diff --git a/[esx_addons]/esx_taxijob/config.lua b/[esx_addons]/esx_taxijob/config.lua index be720fd9..0e2b8af6 100644 --- a/[esx_addons]/esx_taxijob/config.lua +++ b/[esx_addons]/esx_taxijob/config.lua @@ -9,7 +9,7 @@ Config.MaxInService = -1 -- How much people can be in service at o Config.EnablePlayerManagement = true -- Enable society managing. Config.EnableSocietyOwnedVehicles = false -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.OxInventory = ESX.GetConfig().OxInventory diff --git a/[esx_addons]/esx_vehicleshop/config.lua b/[esx_addons]/esx_vehicleshop/config.lua index 264a2849..db529516 100644 --- a/[esx_addons]/esx_vehicleshop/config.lua +++ b/[esx_addons]/esx_vehicleshop/config.lua @@ -4,7 +4,7 @@ Config.MarkerColor = {r = 120, g = 120, b = 240} Config.EnablePlayerManagement = false -- enables the actual car dealer job. You'll need esx_addonaccount, esx_billing and esx_society Config.ResellPercentage = 50 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.LicenseEnable = false -- require people to own drivers license when buying vehicles? Only applies if EnablePlayerManagement is disabled. Requires esx_license diff --git a/[esx_addons]/esx_weaponshop/config.lua b/[esx_addons]/esx_weaponshop/config.lua index 33da63f4..a8c12c5f 100644 --- a/[esx_addons]/esx_weaponshop/config.lua +++ b/[esx_addons]/esx_weaponshop/config.lua @@ -5,7 +5,7 @@ Config.Size = { x = 1.5, y = 1.5, z = 0.5 } Config.Color = { r = 0, g = 128, b = 255 } Config.Type = 1 -Config.Locale = 'en' +Config.Locale = GetConvar('esx:locale', 'en') Config.OxInventory = ESX.GetConfig().OxInventory