From d804fb316f656325d51c29e811c79565669e2682 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 17 Nov 2018 12:37:17 +0100 Subject: [PATCH] Money color and formatting in inventory --- client/functions.lua | 10 +++++++--- client/main.lua | 4 ++-- locales/br.lua | 3 ++- locales/cs.lua | 3 ++- locales/de.lua | 3 ++- locales/en.lua | 3 ++- locales/fi.lua | 3 ++- locales/fr.lua | 3 ++- locales/pl.lua | 3 ++- locales/sv.lua | 3 ++- 10 files changed, 25 insertions(+), 13 deletions(-) diff --git a/client/functions.lua b/client/functions.lua index 5131653e..51337139 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -997,8 +997,10 @@ ESX.ShowInventory = function() local elements = {} if ESX.PlayerData.money > 0 then + local formattedMoney = _U('locale_currency', ESX.Math.GroupDigits(ESX.PlayerData.money)) + table.insert(elements, { - label = _U('cash', ESX.PlayerData.money), + label = ('%s: %s'):format(_U('cash'), formattedMoney), count = ESX.PlayerData.money, type = 'item_money', value = 'money', @@ -1010,8 +1012,10 @@ ESX.ShowInventory = function() for i=1, #ESX.PlayerData.accounts, 1 do if ESX.PlayerData.accounts[i].money > 0 then + local formattedMoney = _U('locale_currency', ESX.Math.GroupDigits(ESX.PlayerData.accounts[i].money)) + table.insert(elements, { - label = ESX.PlayerData.accounts[i].label .. ' $' .. ESX.PlayerData.accounts[i].money, + label = ('%s: %s'):format(ESX.PlayerData.accounts[i].label, formattedMoney), count = ESX.PlayerData.accounts[i].money, type = 'item_account', value = ESX.PlayerData.accounts[i].name, @@ -1042,7 +1046,7 @@ ESX.ShowInventory = function() if HasPedGotWeapon(playerPed, weaponHash, false) and Config.Weapons[i].name ~= 'WEAPON_UNARMED' then local ammo = GetAmmoInPedWeapon(playerPed, weaponHash) table.insert(elements, { - label = Config.Weapons[i].label .. ' x1 [' .. ammo .. ']', + label = Config.Weapons[i].label .. ' [' .. ammo .. ']', count = 1, type = 'item_weapon', value = Config.Weapons[i].name, diff --git a/client/main.lua b/client/main.lua index 6bd986b0..10907c94 100644 --- a/client/main.lua +++ b/client/main.lua @@ -32,7 +32,7 @@ AddEventHandler('esx:playerLoaded', function(xPlayer) }) ESX.UI.HUD.UpdateElement('account_' .. xPlayer.accounts[i].name, { - money = xPlayer.accounts[i].money + money = ESX.Math.GroupDigits(xPlayer.accounts[i].money) }) end @@ -166,7 +166,7 @@ AddEventHandler('esx:setAccountMoney', function(account) if Config.EnableHud then ESX.UI.HUD.UpdateElement('account_' .. account.name, { - money = account.money + money = ESX.Math.GroupDigits(account.money) }) end end) diff --git a/locales/br.lua b/locales/br.lua index 07dde39b..1b54127c 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,6 +1,6 @@ Locales['br'] = { -- Inventory - ['cash'] = 'efectivo $%s', + ['cash'] = 'efectivo', ['inventory'] = 'inventario', ['use'] = 'usar', ['give'] = 'dar', @@ -70,6 +70,7 @@ Locales['br'] = { ['chat_clear_all'] = 'clear the chat for everyone', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', + ['locale_currency'] = '$%s', -- Weapons ['weapon_knife'] = 'faca', ['weapon_nightstick'] = 'cacetete', diff --git a/locales/cs.lua b/locales/cs.lua index 4193b2af..2a3c6bf5 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -1,6 +1,6 @@ Locales['cs'] = { -- Inventory - ['cash'] = 'hotovost $%s', + ['cash'] = 'hotovost', ['inventory'] = 'inventář', ['use'] = 'použít', ['give'] = 'dát', @@ -74,6 +74,7 @@ Locales['cs'] = { ['chat_clear_all'] = 'vyčistit chat pro všechny', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', + ['locale_currency'] = '$%s', -- Weapons ['weapon_knife'] = 'knife', ['weapon_nightstick'] = 'nightstick', diff --git a/locales/de.lua b/locales/de.lua index 2ea6b598..200032df 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,6 +1,6 @@ Locales['de'] = { -- Inventory - ['cash'] = 'kontanter $%s', + ['cash'] = 'kontanter', ['inventory'] = 'inventar', ['use'] = 'benutzen', ['give'] = 'geben', @@ -64,6 +64,7 @@ Locales['de'] = { ['chat_clear_all'] = 'clear the chat for everyone', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', + ['locale_currency'] = '$%s', -- Weapons ['weapon_knife'] = 'Messer', ['weapon_nightstick'] = 'Schlagstock', diff --git a/locales/en.lua b/locales/en.lua index 82317285..3b4859b6 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,6 +1,6 @@ Locales['en'] = { -- Inventory - ['cash'] = 'cash $%s', + ['cash'] = 'cash', ['inventory'] = 'inventory', ['use'] = 'use', ['give'] = 'give', @@ -74,6 +74,7 @@ Locales['en'] = { ['chat_clear_all'] = 'clear the chat for everyone', -- Locale settings ['locale_digit_grouping_symbol'] = ',', + ['locale_currency'] = '$%s', -- Weapons ['weapon_knife'] = 'knife', ['weapon_nightstick'] = 'nightstick', diff --git a/locales/fi.lua b/locales/fi.lua index 4c248515..a22e7130 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,6 +1,6 @@ Locales['fi'] = { -- Inventory - ['cash'] = 'käteinen $%s', + ['cash'] = 'käteinen', ['inventory'] = 'reppu', ['use'] = 'käytä', ['give'] = 'anna', @@ -74,6 +74,7 @@ Locales['fi'] = { ['chat_clear_all'] = 'tyhjennä chatti kaikilta', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', + ['locale_currency'] = '$%s', -- Weapons ['weapon_knife'] = 'veitsi', ['weapon_nightstick'] = 'pamppu', diff --git a/locales/fr.lua b/locales/fr.lua index 818e1892..044a0530 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,6 +1,6 @@ Locales['fr'] = { -- Inventory - ['cash'] = 'espèces $%s', + ['cash'] = 'espèces', ['inventory'] = 'inventaire', ['use'] = 'utiliser', ['give'] = 'donner', @@ -71,6 +71,7 @@ Locales['fr'] = { ['chat_clear_all'] = 'clear the chat for everyone', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', + ['locale_currency'] = '$%s', -- Weapons ['weapon_knife'] = 'couteau', ['weapon_nightstick'] = 'matraque', diff --git a/locales/pl.lua b/locales/pl.lua index ef580470..2b249813 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,6 +1,6 @@ Locales['pl'] = { -- Inventory - ['cash'] = 'gotówka $%s', + ['cash'] = 'gotówka', ['inventory'] = 'ekwipunek', ['use'] = 'użyj', ['give'] = 'daj', @@ -71,6 +71,7 @@ Locales['pl'] = { ['disconnect'] = 'odłącz się od serwera', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', + ['locale_currency'] = '$%s', -- Weapons ['weapon_knife'] = 'nóż', ['weapon_nightstick'] = 'pałka', diff --git a/locales/sv.lua b/locales/sv.lua index f71c0096..0c759e7b 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,6 +1,6 @@ Locales['sv'] = { -- Inventory - ['cash'] = 'kontanter %s SEK', + ['cash'] = 'kontanter', ['inventory'] = 'mitt förråd', ['use'] = 'använd', ['give'] = 'ge', @@ -74,6 +74,7 @@ Locales['sv'] = { ['chat_clear_all'] = 'töm chatten för alla', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', + ['locale_currency'] = '%s SEK', -- Weapons ['weapon_knife'] = 'kniv', ['weapon_nightstick'] = 'batong',