refactor(init): type-fixes and minor adjustments

This commit is contained in:
Linden
2022-09-14 01:42:14 +10:00
parent 26538b8148
commit 32e2da2d8f
3 changed files with 41 additions and 24 deletions

View File

@@ -31,10 +31,10 @@ function lib.getCore()
local resource
if framework == Core.Ox then
import = ('imports/%s.lua'):format(lib.service)
import = ('imports/%s.lua'):format(lib.context)
resource = Core.Ox
else
import = ('imports/getCore/%s/%s.lua'):format(framework, lib.service)
import = ('imports/getCore/%s/%s.lua'):format(framework, lib.context)
resource = lib.name
end
@@ -75,4 +75,5 @@ function lib.getCore()
return result
end
---@diagnostic disable-next-line: deprecated
return lib.getCore

View File

@@ -16,7 +16,7 @@ end
function lib.loadLocale(locale)
if not locale then
locale = lib.service == 'server' and lib.getServerLocale() or GetExternalKvpString('ox_lib', 'locale') or 'en'
locale = lib.context == 'server' and lib.getServerLocale() or GetExternalKvpString('ox_lib', 'locale') or 'en'
end
local resourceName = GetCurrentResourceName()