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

fix(package/locale): sync behaviour with Lua

Browse Source
This commit is contained in:
Linden
2024-05-14 18:19:26 +10:00
parent 8080fa1474
commit 0b13a56071
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imports/locale/shared.lua
View File

@@ -52,7 +52,7 @@ end
local table = lib.table local table = lib.table
---Loads the ox_lib locale module. Prefer using fxmanifest instead (see [docs](https://overextended.dev/ox_lib#usage)). ---Loads the ox_lib locale module. Prefer using fxmanifest instead (see [docs](https://overextended.dev/ox_lib#usage)).
---@param key string ---@param key? string
function lib.locale(key) function lib.locale(key)
local lang = key or lib.getLocaleKey() local lang = key or lib.getLocaleKey()
local locales = loadLocale('en') local locales = loadLocale('en')

4
package/shared/resource/locale/index.ts
View File

@@ -29,6 +29,8 @@ export const locale = (str: string, ...args: any[]) => {
return lstr; return lstr;
} }
return str;
}; };
export const getLocales = () => dict; export const getLocales = () => dict;
@@ -55,7 +57,7 @@ function loadLocale(key: string): typeof dict {
} }
export const initLocale = (key?: string) => { export const initLocale = (key?: string) => {
const lang = key || GetConvar('ox:locale', 'en'); const lang = key || exports.ox_lib.getLocaleKey();
let locales = loadLocale('en'); let locales = loadLocale('en');
if (lang !== 'en') Object.assign(locales, loadLocale(lang)); if (lang !== 'en') Object.assign(locales, loadLocale(lang));