From c59b39e63caa875fa382bce54b940dec11f8b052 Mon Sep 17 00:00:00 2001 From: TheFantomas Date: Sat, 26 Nov 2022 10:47:03 +0100 Subject: [PATCH 1/9] Fix shitty multicharacter locales :( --- [esx]/esx_multicharacter/client/main.lua | 10 +++++----- [esx]/esx_multicharacter/locales/cs.lua | 6 ++++++ [esx]/esx_multicharacter/locales/en.lua | 6 ++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index c3da1835..77df81c7 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -142,14 +142,14 @@ if ESX.GetConfig().Multichar then end function CharacterOptions(Characters, slots, SelectedCharacter) - local elements = {{title = "Character: ".. Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname,icon = "fa-regular fa-user", unselectable = true}, - {title = "Return", unselectable = false,icon = "fa-solid fa-arrow-left",description ="Return To Character Selection.", action = "return"}} + local elements = {{title = _('char_play'.. Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true}, + {title = _('return'), unselectable = false,icon = "fa-solid fa-arrow-left",description =_('return_description'), action = "return"}} if not Characters[SelectedCharacter.value].disabled then - elements[3] = {title = _('char_play'), description ="Continue Into The City.", icon ="fa-solid fa-play",action = 'play', value = SelectedCharacter.value} + elements[3] = {title = _('char_play'), description =_('char_play_description'), icon ="fa-solid fa-play",action = 'play', value = SelectedCharacter.value} else - elements[3] = {title = _('char_disabled'), value = SelectedCharacter.value, icon ="fa-solid fa-xmark", description ="This Character Is Unusable.",} + elements[3] = {title = _('char_disabled'), value = SelectedCharacter.value, icon ="fa-solid fa-xmark", description =_('char_disabled_description'),} end - if Config.CanDelete then elements[4] = {title = _('char_delete'),icon ="fa-solid fa-xmark",description ="Permanently Remove This Character.", action = 'delete', value = SelectedCharacter.value} end + if Config.CanDelete then elements[4] = {title = _('char_delete'),icon ="fa-solid fa-xmark",description =_('char_delete_description'), action = 'delete', value = SelectedCharacter.value} end ESX.OpenContext("left", elements, function(element, Action) if Action.action == "play" then SendNUIMessage({ diff --git a/[esx]/esx_multicharacter/locales/cs.lua b/[esx]/esx_multicharacter/locales/cs.lua index f5510ab3..303b479c 100644 --- a/[esx]/esx_multicharacter/locales/cs.lua +++ b/[esx]/esx_multicharacter/locales/cs.lua @@ -6,8 +6,14 @@ Locales['cs'] = { ["select_char_description"] = "Select a character to play as.", ['create_char'] = "Vytvořit Novou Postavu", ['char_play'] = "Hrát za postavu", + ["char_play_description"] = "Continue Into The City.", ['char_disabled'] = "Tato postava je zakázána!", + ["char_disabled_description"] = "This Character Is Unusable.", ['char_delete'] = "Vymazat postavu", + ["char_delete_description"] = "Permanently Remove This Character.", + ["character"] = "Character %s", + ["return"] = "Return", + ["return_description"] = "Return To Character Selection.", ['cancel'] = "Zrušit", ['confirm'] = "Potvrdit", ['command_setslots'] = "Nastavit slot pro hráče v multicharacteru", diff --git a/[esx]/esx_multicharacter/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua index 12639abb..e3440c64 100644 --- a/[esx]/esx_multicharacter/locales/en.lua +++ b/[esx]/esx_multicharacter/locales/en.lua @@ -6,8 +6,14 @@ Locales["en"] = { ["select_char_description"] = "Select a character to play as.", ["create_char"] = "New Character", ["char_play"] = "Play", + ["char_play_description"] = "Continue Into The City.", ["char_disabled"] = "Disabled", + ["char_disabled_description"] = "This Character Is Unusable.", ["char_delete"] = "Delete", + ["char_delete_description"] = "Permanently Remove This Character.", + ["character"] = "Character %s", + ["return"] = "Return", + ["return_description"] = "Return To Character Selection.", ["cancel"] = "Cancel", ["confirm"] = "Confirm", ["command_setslots"] = "Set multicharacter slots number of a player", From edffb376a9f7614b62660a8590a1824b91ea6d64 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sat, 26 Nov 2022 10:51:34 +0100 Subject: [PATCH 2/9] Little fix --- [esx]/esx_multicharacter/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index 77df81c7..092bb301 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -142,7 +142,7 @@ if ESX.GetConfig().Multichar then end function CharacterOptions(Characters, slots, SelectedCharacter) - local elements = {{title = _('char_play'.. Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true}, + local elements = {{title = _('character', Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true}, {title = _('return'), unselectable = false,icon = "fa-solid fa-arrow-left",description =_('return_description'), action = "return"}} if not Characters[SelectedCharacter.value].disabled then elements[3] = {title = _('char_play'), description =_('char_play_description'), icon ="fa-solid fa-play",action = 'play', value = SelectedCharacter.value} From b84191b106f94a14ddb72ab67808422f75242a9f Mon Sep 17 00:00:00 2001 From: TheFantomas Date: Sat, 26 Nov 2022 10:53:29 +0100 Subject: [PATCH 3/9] Locale edit --- [esx]/esx_multicharacter/locales/cs.lua | 2 +- [esx]/esx_multicharacter/locales/en.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx]/esx_multicharacter/locales/cs.lua b/[esx]/esx_multicharacter/locales/cs.lua index 303b479c..5093e4bf 100644 --- a/[esx]/esx_multicharacter/locales/cs.lua +++ b/[esx]/esx_multicharacter/locales/cs.lua @@ -11,7 +11,7 @@ Locales['cs'] = { ["char_disabled_description"] = "This Character Is Unusable.", ['char_delete'] = "Vymazat postavu", ["char_delete_description"] = "Permanently Remove This Character.", - ["character"] = "Character %s", + ["character"] = "Character: %s", ["return"] = "Return", ["return_description"] = "Return To Character Selection.", ['cancel'] = "Zrušit", diff --git a/[esx]/esx_multicharacter/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua index e3440c64..2a63f178 100644 --- a/[esx]/esx_multicharacter/locales/en.lua +++ b/[esx]/esx_multicharacter/locales/en.lua @@ -11,7 +11,7 @@ Locales["en"] = { ["char_disabled_description"] = "This Character Is Unusable.", ["char_delete"] = "Delete", ["char_delete_description"] = "Permanently Remove This Character.", - ["character"] = "Character %s", + ["character"] = "Character: %s", ["return"] = "Return", ["return_description"] = "Return To Character Selection.", ["cancel"] = "Cancel", From df7d2e703139076d2ed35622d8529a5c60f15b2a Mon Sep 17 00:00:00 2001 From: TheFantomas Date: Sat, 26 Nov 2022 10:56:10 +0100 Subject: [PATCH 4/9] Remove unusable shit --- [esx]/esx_multicharacter/locales/en.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/[esx]/esx_multicharacter/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua index 2a63f178..3e1b383e 100644 --- a/[esx]/esx_multicharacter/locales/en.lua +++ b/[esx]/esx_multicharacter/locales/en.lua @@ -1,7 +1,6 @@ Locales["en"] = { ["male"] = "Male", ["female"] = "Female", - ["delete_label"] = "Delete %s %s?", ["select_char"] = "Select Character", ["select_char_description"] = "Select a character to play as.", ["create_char"] = "New Character", From 072c2d6b60f9ed99237566bbea2cf2086cf4d3d1 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sat, 26 Nov 2022 11:02:37 +0100 Subject: [PATCH 5/9] Cs full locaes :) --- [esx]/esx_multicharacter/locales/cs.lua | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/[esx]/esx_multicharacter/locales/cs.lua b/[esx]/esx_multicharacter/locales/cs.lua index 5093e4bf..b1f03691 100644 --- a/[esx]/esx_multicharacter/locales/cs.lua +++ b/[esx]/esx_multicharacter/locales/cs.lua @@ -1,32 +1,31 @@ Locales['cs'] = { - ['male'] = "Muž", - ['female'] = "Žena", - ['delete_label'] = "Vymazat %s %s?", + ["male"] = "Muž", + ["female"] = "Žena", ['select_char'] = "Zvolit Postavu", - ["select_char_description"] = "Select a character to play as.", + ["select_char_description"] = "Zvol si postavu za kterou budeš hrát.", ['create_char'] = "Vytvořit Novou Postavu", ['char_play'] = "Hrát za postavu", - ["char_play_description"] = "Continue Into The City.", + ["char_play_description"] = "Pokračovat do města.", ['char_disabled'] = "Tato postava je zakázána!", - ["char_disabled_description"] = "This Character Is Unusable.", + ["char_disabled_description"] = "Tuto postavu nemůžeš používat.", ['char_delete'] = "Vymazat postavu", - ["char_delete_description"] = "Permanently Remove This Character.", - ["character"] = "Character: %s", - ["return"] = "Return", - ["return_description"] = "Return To Character Selection.", + ["char_delete_description"] = "Na vždy smazat tuto postavu.", + ["character"] = "Postava: %s", + ["return"] = "Zpět", + ["return_description"] = "Vrátit se na vybírání postav.", ['cancel'] = "Zrušit", ['confirm'] = "Potvrdit", - ['command_setslots'] = "Nastavit slot pro hráče v multicharacteru", - ['command_remslots'] = "Odebrat slot pro hráče v multicharacteru", - ['command_enablechar'] = "Povolit zovlený slot hráči", - ['command_disablechar'] = "Zakázat zvolený slot pro hračé", + ['command_setslots'] = "Nastavit sloty pro hráče v multicharacteru", + ['command_remslots'] = "Odebrat sloty pro hráče v multicharacteru", + ['command_enablechar'] = "Povolit zvolený slot hráči", + ['command_disablechar'] = "Zakázat zvolený slot pro hrače", ['command_charslot'] = "Číslo slotu", ['command_identifier'] = "Identifier hráče", ['command_slots'] = "# ze slotu", ['slotsadd'] = "Přidal slot %s hráči %s", ['slotsedit'] = "Nastavil si slot %s hráči %s", ['slotsrem'] = "Odebral si slot %s", - ['charenabled'] = "Povolol si postavu #%s z %s", + ['charenabled'] = "Povolil si postavu #%s z %s", ['chardisabled'] = "Zakázal si postavu #%s z %s", ['charnotfound'] = "Postava #%s z %s nebyla nalezena/neexistuje", } From 8e6f6449567d51fc04002d6656c4886a610d258b Mon Sep 17 00:00:00 2001 From: TheFantomas Date: Sat, 26 Nov 2022 11:07:36 +0100 Subject: [PATCH 6/9] UNUSED --- [esx]/esx_multicharacter/locales/cs.lua | 2 -- [esx]/esx_multicharacter/locales/en.lua | 2 -- 2 files changed, 4 deletions(-) diff --git a/[esx]/esx_multicharacter/locales/cs.lua b/[esx]/esx_multicharacter/locales/cs.lua index b1f03691..f02f14c4 100644 --- a/[esx]/esx_multicharacter/locales/cs.lua +++ b/[esx]/esx_multicharacter/locales/cs.lua @@ -13,8 +13,6 @@ Locales['cs'] = { ["character"] = "Postava: %s", ["return"] = "Zpět", ["return_description"] = "Vrátit se na vybírání postav.", - ['cancel'] = "Zrušit", - ['confirm'] = "Potvrdit", ['command_setslots'] = "Nastavit sloty pro hráče v multicharacteru", ['command_remslots'] = "Odebrat sloty pro hráče v multicharacteru", ['command_enablechar'] = "Povolit zvolený slot hráči", diff --git a/[esx]/esx_multicharacter/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua index 3e1b383e..64491ee2 100644 --- a/[esx]/esx_multicharacter/locales/en.lua +++ b/[esx]/esx_multicharacter/locales/en.lua @@ -13,8 +13,6 @@ Locales["en"] = { ["character"] = "Character: %s", ["return"] = "Return", ["return_description"] = "Return To Character Selection.", - ["cancel"] = "Cancel", - ["confirm"] = "Confirm", ["command_setslots"] = "Set multicharacter slots number of a player", ["command_remslots"] = "Remove multicharacter slots number of a player", ["command_enablechar"] = "Enable a given character of a player", From 461a8b903114d2907b29443460c5b813c4c0729e Mon Sep 17 00:00:00 2001 From: TheFantomas Date: Sat, 26 Nov 2022 18:03:32 +0100 Subject: [PATCH 7/9] TranslateCap --- [esx]/esx_multicharacter/client/main.lua | 16 ++++++++-------- [esx]/esx_multicharacter/server/main.lua | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index 092bb301..5bd2240b 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -110,7 +110,7 @@ if ESX.GetConfig().Multichar then if Characters[index] then local skin = Characters[index].skin or Config.Default if not Characters[index].model then - if Characters[index].sex == _('female') then skin.sex = 1 else skin.sex = 0 end + if Characters[index].sex == TranslateCapCap('female') then skin.sex = 1 else skin.sex = 0 end end TriggerEvent('skinchanger:loadSkin', skin) end @@ -142,14 +142,14 @@ if ESX.GetConfig().Multichar then end function CharacterOptions(Characters, slots, SelectedCharacter) - local elements = {{title = _('character', Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true}, - {title = _('return'), unselectable = false,icon = "fa-solid fa-arrow-left",description =_('return_description'), action = "return"}} + local elements = {{title = TranslateCap('character', Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true}, + {title = TranslateCap('return'), unselectable = false,icon = "fa-solid fa-arrow-left",description = TranslateCap('return_description'), action = "return"}} if not Characters[SelectedCharacter.value].disabled then - elements[3] = {title = _('char_play'), description =_('char_play_description'), icon ="fa-solid fa-play",action = 'play', value = SelectedCharacter.value} + elements[3] = {title = TranslateCap('char_play'), description = TranslateCap('char_play_description'), icon ="fa-solid fa-play",action = 'play', value = SelectedCharacter.value} else - elements[3] = {title = _('char_disabled'), value = SelectedCharacter.value, icon ="fa-solid fa-xmark", description =_('char_disabled_description'),} + elements[3] = {title = TranslateCap('char_disabled'), value = SelectedCharacter.value, icon ="fa-solid fa-xmark", description = TranslateCap('char_disabled_description'),} end - if Config.CanDelete then elements[4] = {title = _('char_delete'),icon ="fa-solid fa-xmark",description =_('char_delete_description'), action = 'delete', value = SelectedCharacter.value} end + if Config.CanDelete then elements[4] = {title = TranslateCap('char_delete'),icon ="fa-solid fa-xmark",description = TranslateCap('char_delete_description'), action = 'delete', value = SelectedCharacter.value} end ESX.OpenContext("left", elements, function(element, Action) if Action.action == "play" then SendNUIMessage({ @@ -169,7 +169,7 @@ if ESX.GetConfig().Multichar then function SelectCharacterMenu(Characters, slots) local Character = next(Characters) - local elements = {{title = _('select_char') , icon = "fa-solid fa-users", description = _('select_char_description') , unselectable = true}} + local elements = {{title = TranslateCap('select_char') , icon = "fa-solid fa-users", description = TranslateCap('select_char_description') , unselectable = true}} for k,v in pairs(Characters) do if not v.model and v.skin then if v.skin.model then v.model = v.skin.model elseif v.skin.sex == 1 then v.model = mp_f_freemode_01 else v.model = mp_m_freemode_01 end @@ -183,7 +183,7 @@ if ESX.GetConfig().Multichar then end end if #elements - 1 < slots then - elements[#elements+1] = {title = _('create_char'), icon = "fa-solid fa-plus", value = (#elements+1), new = true} + elements[#elements+1] = {title = TranslateCap('create_char'), icon = "fa-solid fa-plus", value = (#elements+1), new = true} end ESX.OpenContext("left", elements, function(menu, SelectedCharacter) diff --git a/[esx]/esx_multicharacter/server/main.lua b/[esx]/esx_multicharacter/server/main.lua index a844dfb9..928a63be 100644 --- a/[esx]/esx_multicharacter/server/main.lua +++ b/[esx]/esx_multicharacter/server/main.lua @@ -81,7 +81,7 @@ elseif ESX.GetConfig().Multichar == true then dateofbirth = v.dateofbirth, skin = v.skin and json.decode(v.skin) or {}, disabled = v.disabled, - sex = v.sex == 'm' and _('male') or _('female') + sex = v.sex == 'm' and Translate('male') or Translate('female') } end end From 0dc4bb4f96f91d5eee976e2096ade4aab6bd771a Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sat, 26 Nov 2022 18:04:41 +0100 Subject: [PATCH 8/9] 2nd fix --- [esx]/esx_multicharacter/server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/esx_multicharacter/server/main.lua b/[esx]/esx_multicharacter/server/main.lua index 928a63be..782fc43b 100644 --- a/[esx]/esx_multicharacter/server/main.lua +++ b/[esx]/esx_multicharacter/server/main.lua @@ -81,7 +81,7 @@ elseif ESX.GetConfig().Multichar == true then dateofbirth = v.dateofbirth, skin = v.skin and json.decode(v.skin) or {}, disabled = v.disabled, - sex = v.sex == 'm' and Translate('male') or Translate('female') + sex = v.sex == 'm' and TranslateCap('male') or TranslateCap('female') } end end From 8a60250cea0e127f271ac0f0d3278e97446ea700 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sat, 26 Nov 2022 18:07:52 +0100 Subject: [PATCH 9/9] uh --- [esx]/esx_multicharacter/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index 5bd2240b..69365dee 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -110,7 +110,7 @@ if ESX.GetConfig().Multichar then if Characters[index] then local skin = Characters[index].skin or Config.Default if not Characters[index].model then - if Characters[index].sex == TranslateCapCap('female') then skin.sex = 1 else skin.sex = 0 end + if Characters[index].sex == TranslateCap('female') then skin.sex = 1 else skin.sex = 0 end end TriggerEvent('skinchanger:loadSkin', skin) end