starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed duplicate locale strings, closes #95

Browse Source
This commit is contained in:
ElPumpo
2018-06-25 21:45:23 +02:00
parent 6d99719a50
commit 7ed39a4666
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locales/br.lua
+1 -1
View File
@@ -32,7 +32,7 @@ Locales['br'] = {
['received_salary'] = 'voce recebeu seu salario: ~g~$%s~s~ ', ['received_salary'] = 'voce recebeu seu salario: ~g~$%s~s~ ',
['received_help'] = 'voce recebeu seu cheque de bem-estar: ~g~$%s~s~ ', ['received_help'] = 'voce recebeu seu cheque de bem-estar: ~g~$%s~s~ ',
['company_nomoney'] = 'a empresa em que voce esta empregado esta muito pobre para pagar seu salario.', ['company_nomoney'] = 'a empresa em que voce esta empregado esta muito pobre para pagar seu salario.',
['received_money'] = 'recebeu dinheiro', ['received_paycheck'] = 'recebeu dinheiro',
['bank'] = 'banco', ['bank'] = 'banco',
['black_money'] = 'dinheiro sujo', ['black_money'] = 'dinheiro sujo',
['act_imp'] = 'acao impossivel', ['act_imp'] = 'acao impossivel',
locales/de.lua
+1 -1
View File
@@ -32,7 +32,7 @@ Locales['de'] = {
['received_salary'] = 'du hast dein Gehalt erhalten: ~g~$%s~s~', ['received_salary'] = 'du hast dein Gehalt erhalten: ~g~$%s~s~',
['received_help'] = 'you recieved your welfare check: ~g~$%s~s~', ['received_help'] = 'you recieved your welfare check: ~g~$%s~s~',
['company_nomoney'] = 'the company you\'re employeed at is too poor to pay out your salary.', ['company_nomoney'] = 'the company you\'re employeed at is too poor to pay out your salary.',
['received_money'] = 'received money', ['received_paycheck'] = 'received paycheck',
['bank'] = 'bank', ['bank'] = 'bank',
['black_money'] = 'dirty Money', ['black_money'] = 'dirty Money',
locales/en.lua
+1 -1
View File
@@ -32,7 +32,7 @@ Locales['en'] = {
['received_salary'] = 'you received your salary: ~g~$%s~s~', ['received_salary'] = 'you received your salary: ~g~$%s~s~',
['received_help'] = 'you recieved your welfare check: ~g~$%s~s~', ['received_help'] = 'you recieved your welfare check: ~g~$%s~s~',
['company_nomoney'] = 'the company you\'re employeed at is too poor to pay out your salary.', ['company_nomoney'] = 'the company you\'re employeed at is too poor to pay out your salary.',
['received_money'] = 'received money', ['received_paycheck'] = 'received paycheck',
['bank'] = 'bank', ['bank'] = 'bank',
['black_money'] = 'dirty Money', ['black_money'] = 'dirty Money',
locales/fi.lua
+1 -1
View File
@@ -32,7 +32,7 @@ Locales['fi'] = {
['received_salary'] = 'sinä vastaanotit palkkaa: ~g~$%s~s~', ['received_salary'] = 'sinä vastaanotit palkkaa: ~g~$%s~s~',
['received_help'] = 'sinä vastaanotit valtion tukea: ~g~$%s~s~', ['received_help'] = 'sinä vastaanotit valtion tukea: ~g~$%s~s~',
['company_nomoney'] = 'yritys jolle teet töitä on köyhä eikä voi maksaa palkkaasi.', ['company_nomoney'] = 'yritys jolle teet töitä on köyhä eikä voi maksaa palkkaasi.',
['received_money'] = 'sai rahaa', ['received_paycheck'] = 'sai rahaa',
['bank'] = 'Pankki', ['bank'] = 'Pankki',
['black_money'] = 'likainen Raha', ['black_money'] = 'likainen Raha',
locales/fr.lua
+2 -2
View File
@@ -31,8 +31,8 @@ Locales['fr'] = {
-- Salary related -- Salary related
['received_salary'] = 'vous avez reçu votre salaire: ~g~$%s~s~', ['received_salary'] = 'vous avez reçu votre salaire: ~g~$%s~s~',
['received_help'] = 'vous avez reçu une aide de l\'état: ~g~$%s~s~', ['received_help'] = 'vous avez reçu une aide de l\'état: ~g~$%s~s~',
['company_nomoney'] = 'votre entreprise n\'a plus d\'argent pour vous payer!', -- fix translation ['company_nomoney'] = 'votre entreprise n\'a plus d\'argent pour vous payer!',
['received_money'] = 'received money', ['received_paycheck'] = 'received paycheck',
['bank'] = 'banque', ['bank'] = 'banque',
['black_money'] = 'argent Sale', ['black_money'] = 'argent Sale',
locales/sv.lua
+1 -1
View File
@@ -32,7 +32,7 @@ Locales['sv'] = {
['received_salary'] = 'du har mottagit din lön på ~g~$%s~s~', ['received_salary'] = 'du har mottagit din lön på ~g~$%s~s~',
['received_help'] = 'du har mottagit bidrag på ~g~$%s~s~', ['received_help'] = 'du har mottagit bidrag på ~g~$%s~s~',
['company_nomoney'] = 'företaget du är anställt hos har inte råd att betala ut din lön.', ['company_nomoney'] = 'företaget du är anställt hos har inte råd att betala ut din lön.',
['received_money'] = 'mottagit pengar', ['received_paycheck'] = 'mottagit lön',
['bank'] = 'bank', ['bank'] = 'bank',
['black_money'] = 'svarta pengar', ['black_money'] = 'svarta pengar',
server/paycheck.lua
+4 -4
View File
@@ -11,7 +11,7 @@ ESX.StartPayCheck = function()
if salary > 0 then if salary > 0 then
if job == 'unemployed' then -- unemployed if job == 'unemployed' then -- unemployed
xPlayer.addAccountMoney('bank', salary) xPlayer.addAccountMoney('bank', salary)
TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_help', salary), 'CHAR_BANK_MAZE', 9) TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_help', salary), 'CHAR_BANK_MAZE', 9)
elseif Config.EnableSocietyPayouts then -- possibly a society elseif Config.EnableSocietyPayouts then -- possibly a society
TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society) TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society)
if society ~= nil then -- verified society if society ~= nil then -- verified society
@@ -20,19 +20,19 @@ ESX.StartPayCheck = function()
xPlayer.addAccountMoney('bank', salary) xPlayer.addAccountMoney('bank', salary)
account.removeMoney(salary) account.removeMoney(salary)
TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9)
else else
TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), '', _U('company_nomoney'), 'CHAR_BANK_MAZE', 1) TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), '', _U('company_nomoney'), 'CHAR_BANK_MAZE', 1)
end end
end) end)
else -- not a society else -- not a society
xPlayer.addAccountMoney('bank', salary) xPlayer.addAccountMoney('bank', salary)
TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9)
end end
end) end)
else -- generic job else -- generic job
xPlayer.addAccountMoney('bank', salary) xPlayer.addAccountMoney('bank', salary)
TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_money'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9) TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9)
end end
end end