FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-19 07:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(imports/locale): prevent error from invalid locales

Browse Source 
People with poorly formatted json files would not get a locales table,
leading to an error when trying to iterate.
Contains some other inconsequential changes, and warnings.
This commit is contained in:
Linden
2023-02-23 18:54:49 +11:00
parent b22840f102
commit c57b1a9215
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
imports/locale/shared.lua
View File

@@ -1,3 +1,4 @@
---@type { [string]: string }
local dict = {} local dict = {}
---@param str string ---@param str string
@@ -17,13 +18,28 @@ function locale(str, ...)
return str return str
end end
---@return { [string]: string }
function lib.getLocales() function lib.getLocales()
return dict return dict
end end
function lib.loadLocale() function lib.locale()
local locales = json.decode(LoadResourceFile(cache.resource, ('locales/%s.json'):format(GetConvar('ox:locale', 'en'))) or LoadResourceFile(cache.resource, 'locales/en.json') or '[]') local lang = GetConvar('ox:locale', 'en')
local locales = json.decode(LoadResourceFile(cache.resource, ('locales/%s.json'):format(lang)))
if not locales then
local warning = "could not load 'locales/%s.json'"
warn(warning:format(lang))
if lang ~= 'en' then
locales = json.decode(LoadResourceFile(cache.resource, 'locales/en.json'))
if not locales then
warn(warning:format('en'))
end
end
if not locales then return end
end
for k, v in pairs(locales) do for k, v in pairs(locales) do
if type(v) == 'string' then if type(v) == 'string' then
@@ -41,4 +57,4 @@ function lib.loadLocale()
end end
end end
return lib.loadLocale return lib.locale