refactor(locale): server locales

server/character.lua

@@ -78,5 +78,5 @@ end)
 RegisterNetEvent('qbx_core:server:deleteCharacter', function(citizenId)
     local src = source
     DeleteCharacter(src, citizenId)
-    Notify(src, Lang:t('success.character_deleted'), 'success')
+    Notify(src, locale('success.character_deleted'), 'success')
 end)

server/events.lua

@@ -25,7 +25,7 @@ AddEventHandler('playerJoining', function()
     if not serverConfig.checkDuplicateLicense then return end
     if usedLicenses[license] then
         Wait(0) -- mandatory wait for the drop reason to show up
-        DropPlayer(src, Lang:t('error.duplicate_license'))
+        DropPlayer(src, locale('error.duplicate_license'))
     else
         usedLicenses[license] = true
     end
@@ -76,17 +76,17 @@ local function onPlayerConnecting(name, _, deferrals)
     end
 
     if not license then
-        deferrals.done(Lang:t('error.no_valid_license'))
+        deferrals.done(locale('error.no_valid_license'))
     elseif serverConfig.checkDuplicateLicense and IsLicenseInUse(license) then
-        deferrals.done(Lang:t('error.duplicate_license'))
+        deferrals.done(locale('error.duplicate_license'))
     end
 
     local databaseTime = os.clock()
     local databasePromise = promise.new()
 
     -- conduct database-dependant checks
     CreateThread(function()
-        deferrals.update(string.format(Lang:t('info.checking_ban'), name))
+        deferrals.update(locale('info.checking_ban', name))
         local success, err = pcall(function()
             local isBanned, Reason = IsPlayerBanned(src --[[@as Source]])
             if isBanned then
@@ -96,11 +96,11 @@ local function onPlayerConnecting(name, _, deferrals)
         end)
 
         if serverConfig.whitelist and success then
-            deferrals.update(string.format(Lang:t('info.checking_whitelisted'), name))
+            deferrals.update(string.format(locale('info.checking_whitelisted'), name))
             success, err = pcall(function()
                 if not IsWhitelisted(src --[[@as Source]]) then
                     Wait(0) -- Mandatory wait
-                    deferrals.done(Lang:t('error.not_whitelisted'))
+                    deferrals.done(locale('error.not_whitelisted'))
                 end
             end)
         end
@@ -113,7 +113,7 @@ local function onPlayerConnecting(name, _, deferrals)
 
     -- wait for database to finish
     databasePromise:next(function()
-        deferrals.update(string.format(Lang:t('info.join_server'), name))
+        deferrals.update(locale('info.join_server', name))
 
         -- Mandatory wait
         Wait(0)
@@ -124,15 +124,15 @@ local function onPlayerConnecting(name, _, deferrals)
             deferrals.done()
         end
     end, function(err)
-        deferrals.done(Lang:t('error.connecting_error'))
+        deferrals.done(locale('error.connecting_error'))
         lib.print.error(err)
     end)
 
     -- if conducting db checks for too long then raise error
     while databasePromise.state == 0 do
         if os.clock() - databaseTime > 30 then
-            deferrals.done(Lang:t('error.connecting_database_timeout'))
-            error(Lang:t('error.connecting_database_timeout'))
+            deferrals.done(locale('error.connecting_database_timeout'))
+            error(locale('error.connecting_database_timeout'))
             break
         end
         Wait(1000)
@@ -170,7 +170,7 @@ RegisterNetEvent('QBCore:Server:CloseServer', function(reason)
             end
         end
     else
-        KickWithReason(src, Lang:t("error.no_permission"), nil, nil)
+        KickWithReason(src, locale("error.no_permission"), nil, nil)
     end
 end)
 
@@ -179,7 +179,7 @@ RegisterNetEvent('QBCore:Server:OpenServer', function()
     if HasPermission(src, 'admin') then
         serverConfig.closed = false
     else
-        KickWithReason(src, Lang:t("error.no_permission"), nil, nil)
+        KickWithReason(src, locale("error.no_permission"), nil, nil)
     end
 end)
 
@@ -191,10 +191,10 @@ RegisterNetEvent('QBCore:ToggleDuty', function()
     if not player then return end
     if player.PlayerData.job.onduty then
         player.Functions.SetJobDuty(false)
-        Notify(src, Lang:t('info.off_duty'))
+        Notify(src, locale('info.off_duty'))
     else
         player.Functions.SetJobDuty(true)
-        Notify(src, Lang:t('info.on_duty'))
+        Notify(src, locale('info.on_duty'))
     end
     TriggerClientEvent('QBCore:Client:SetDuty', src, player.PlayerData.job.onduty)
 end)

server/functions.lua

@@ -400,7 +400,7 @@ local function ExploitBan(playerId, origin)
             bannedBy = 'Anti Cheat'
         })
     end)
-    DropPlayer(playerId --[[@as string]], Lang:t('info.exploit_banned', {discord = serverConfig.discord}))
+    DropPlayer(playerId --[[@as string]], locale('info.exploit_banned', serverConfig.discord))
     logger.log({
         source = 'qbx_core',
         webhook = loggingConfig.webhook['anticheat'],

server/loops.lua

@@ -27,7 +27,7 @@ end)
 
 local function sendPaycheck(player, payment)
     player.Functions.AddMoney('bank', payment)
-    Notify(player.PlayerData.source, Lang:t('info.received_paycheck', {value = payment}))
+    Notify(player.PlayerData.source, locale('info.received_paycheck', payment))
 end
 
 local function pay(player)
@@ -45,7 +45,7 @@ local function pay(player)
         return
     end
     if account < payment then -- Checks if company has enough money to pay society
-        Notify(player.PlayerData.source, Lang:t('error.company_too_poor'), 'error')
+        Notify(player.PlayerData.source, locale('error.company_too_poor'), 'error')
         return
     end
     config.removeSocietyMoney(job.name, payment)

server/main.lua

@@ -1,6 +1,8 @@
 lib.versionCheck('Qbox-project/qbx_core')
 if not lib.checkDependency('ox_lib', '3.10.0', true) then error() return end
 
+lib.locale()
+
 ---@type 'strict'|'relaxed'|'inactive'
 local bucketLockDownMode = GetConvar('qbx:bucketlockdownmode', 'inactive')
 SetRoutingBucketEntityLockdownMode(0, bucketLockDownMode)

server/player.lua

@@ -32,7 +32,7 @@ function LoginV2(source, citizenid, newData)
         if playerData and (license2 == playerData.license or license == playerData.license) then
             return CheckPlayerData(source, playerData)
         else
-            DropPlayer(tostring(source), Lang:t("info.exploit_dropped"))
+            DropPlayer(tostring(source), locale("info.exploit_dropped"))
             logger.log({
                 source = 'qbx_core',
                 webhook = config.logging.webhook['anticheat'],
@@ -548,7 +548,7 @@ function DeleteCharacter(source, citizenid)
             end
         end)
     else
-        DropPlayer(tostring(source), Lang:t("info.exploit_dropped"))
+        DropPlayer(tostring(source), locale("info.exploit_dropped"))
         logger.log({
             source = 'qbx_core',
             webhook = config.logging.webhook['anticheat'],

server/queue.lua

@@ -207,7 +207,7 @@ local function awaitPlayerQueue(source, license, deferrals)
     local data = playerDatas[license]
 
     if data and not playerTimingOut then
-        deferrals.done(Lang:t('error.already_in_queue'))
+        deferrals.done(locale('error.already_in_queue'))
         return
     end
 
@@ -222,7 +222,7 @@ local function awaitPlayerQueue(source, license, deferrals)
         end
 
         if not subQueueIndex then
-            deferrals.done(Lang:t('error.no_subqueue'))
+            deferrals.done(locale('error.no_subqueue'))
             return
         end
 
@@ -245,12 +245,7 @@ local function awaitPlayerQueue(source, license, deferrals)
                 displayTime = displayTime,
             }))
         else
-            deferrals.update(Lang:t('info.in_queue', {
-                queuePos = data.globalPos,
-                queueSize = totalQueueSize,
-                subQueue = subQueue.name,
-                displayTime = displayTime,
-            }))
+            deferrals.update(locale('info.in_queue', data.globalPos, totalQueueSize, subQueue.name, displayTime))
         end
 
         data.waitingSeconds += 1