From 01770187bca941d79e2baab5a0d6ed3f25378bf1 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Tue, 16 Apr 2024 05:33:35 +1000 Subject: [PATCH] refactor(locale): set default locale in settings --- resource/locale/client.lua | 2 -- resource/settings.lua | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/resource/locale/client.lua b/resource/locale/client.lua index 74497694..baaebfce 100644 --- a/resource/locale/client.lua +++ b/resource/locale/client.lua @@ -27,6 +27,4 @@ RegisterNUICallback('init', function(_, cb) }) end) -if not settings.locale then lib.setLocale(GetConvar('ox:locale', 'en')) end - lib.locale(settings.locale) diff --git a/resource/settings.lua b/resource/settings.lua index ffb4e3cb..73a5c4cc 100644 --- a/resource/settings.lua +++ b/resource/settings.lua @@ -1,5 +1,5 @@ local settings = { - locale = GetResourceKvpString('locale'), + locale = GetResourceKvpString('locale') or GetConvar('ox:locale', 'en'), notification_position = GetResourceKvpString('notification_position') or 'top-right', notification_audio = GetResourceKvpInt('notification_audio') == 1 }