Squashed commit of the following:

commit 4e52da5 Merge: c048b43 c8f062b Author: Csoki <[email protected]> Date: Wed Oct 5 16:35:53 2022 +0200 Merge branch 'main' into locale-convar commit c048b43 Merge: e9fb988 d16869b Author: Csoki <[email protected]> Date: Sat Sep 17 15:06:21 2022 +0200 Merge branch 'main' into locale-convar commit e9fb988 Author: Csoki <[email protected]> Date: Thu Sep 15 00:26:18 2022 +0200 add server.cfg esx:locale convar commit dffaa5c Author: Csoki <[email protected]> Date: Thu Sep 15 00:24:55 2022 +0200 refactor translate function commit f665fc2 Author: Csoki <[email protected]> Date: Thu Sep 15 00:23:24 2022 +0200 change all Config.locale to convar
spacevx · Oct 9, 2022 · 7d9e994 · 7d9e994
1 parent a9457a7
commit 7d9e994
Show file tree

Hide file tree

Showing 34 changed files with 35 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 Config = {}
-Config.Locale = 'en'
+Config.Locale = GetConvar('esx:locale', 'en')
 Config.Visible = true
 
 Config.Food = {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@ Config.MarkerColor = {r = 100, g = 200, b = 104}
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.MenuPosition  = "right"
 Config.OxInventory   = ESX.GetConfig().OxInventory
 

diff --git a/server.cfg b/server.cfg
@@ -29,6 +29,8 @@ set onesync on  # Enable OneSync [REQUIRED FOR LEGACY 1.7.5 +]
 set mysql_connection_string "mysql://user:password@localhost/es_extended?waitForConnections=true&charset=utf8mb4"
 set mysql_ui true
 
+setr esx:locale "en"
+
 ## These resources will start by default.
 ensure chat
 ensure spawnmanager