diff --git a/imports/locale/shared.lua b/imports/locale/shared.lua index fd40938..7937c70 100644 --- a/imports/locale/shared.lua +++ b/imports/locale/shared.lua @@ -26,5 +26,6 @@ end AddEventHandler('ox_lib:setLocale', loadLocale) return function() - loadLocale(GetExternalKvpString('ox_lib', 'locale') or 'en-US') + local lang = IsDuplicityVersion() and lib.getServerLocale() or GetExternalKvpString('ox_lib', 'locale') or 'en-US' + loadLocale(lang) end diff --git a/resource/locale/server.lua b/resource/locale/server.lua index d5edfa1..6d22597 100644 --- a/resource/locale/server.lua +++ b/resource/locale/server.lua @@ -1,5 +1,10 @@ RegisterCommand('serverlocale', function(_, args, _) if args?[1] then SetResourceKvp('locale', args[1]) + TriggerEvent('ox_lib:setLocale', args[1]) end end, true) + +function lib.getServerLocale() + return GetResourceKvpString('locale') or 'en-US' +end