From 91f52d12c1921b0137bd3f1feb7c3dc96cd00fb7 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 6 May 2022 16:38:36 +1000 Subject: [PATCH] refactor(client/locale): send GlobalState.locales to ui --- resource/locale/client.lua | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/resource/locale/client.lua b/resource/locale/client.lua index 0fb0f1f..803f5ad 100644 --- a/resource/locale/client.lua +++ b/resource/locale/client.lua @@ -1,5 +1,4 @@ local default = { 'en', 'fr', 'de', 'it', 'es', 'pt-BR', 'pl', 'ru', 'ko', 'zh-TW', 'ja', 'es-MX', 'zh-CN' } -local uiLoaded = false local userLocale = GetResourceKvpString('locale') or default[GetCurrentLanguage() + 1] local function loadLocale(locale, cb) @@ -22,24 +21,17 @@ RegisterNUICallback('closeSettings', function(_, cb) SetNuiFocus(false, false) end) +RegisterNUICallback('init', function(_, cb) + cb(1) -Citizen.CreateThread(function() - while not uiLoaded do Wait(0) end - - SendNUIMessage({ -- Loads the `default` array into select options + SendNUIMessage({ action = 'loadLocales', - data = default + data = GlobalState.locales }) loadLocale(userLocale) end) - -RegisterNUICallback('init', function(_, cb) - cb(1) - uiLoaded = true -end) - RegisterCommand('ox_lib', function() SendNUIMessage({ action = 'openSettings',