From 031cccd8867c40d2eb3adfb8b2fe40d12dfbf3c9 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Fri, 29 Apr 2022 16:53:24 +1000
Subject: [PATCH] fix(locale): server hotload and "external" kvp

External kvp's don't exist for the server, so we have to export the proper language.
---
 imports/locale/shared.lua  | 3 ++-
 resource/locale/server.lua | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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