Merge branch 'dev'

[core]/es_extended/config.lua

@@ -1,5 +1,9 @@
 Config = {}
-Config.Locale = GetConvar("esx:locale", "en")
+
+local txAdminLocale = GetConvar("txAdmin-locale", "en")
+local esxLocale = GetConvar("esx:locale", "none")
+
+Config.Locale = esxLocale == "none" and txAdminLocale or esxLocale
 
 Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing'
 

server.cfg

@@ -29,7 +29,9 @@ 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"
+## Umcomment to set your own locale,
+## if not, it will use the language you have selected in txAdmin.
+#setr esx:locale "en"
 
 ## These resources will start by default.
 ensure chat