From 7ed39a4666e14e08b59fc189b3f84fa2fbab72ed Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 25 Jun 2018 21:45:23 +0200 Subject: [PATCH] Fixed duplicate locale strings, closes #95 --- locales/br.lua | 2 +- locales/de.lua | 2 +- locales/en.lua | 2 +- locales/fi.lua | 2 +- locales/fr.lua | 4 ++-- locales/sv.lua | 2 +- server/paycheck.lua | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 5b5231c3..70c77d3c 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -32,7 +32,7 @@ Locales['br'] = { ['received_salary'] = 'voce recebeu seu salario: ~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.', - ['received_money'] = 'recebeu dinheiro', + ['received_paycheck'] = 'recebeu dinheiro', ['bank'] = 'banco', ['black_money'] = 'dinheiro sujo', ['act_imp'] = 'acao impossivel', diff --git a/locales/de.lua b/locales/de.lua index 97353c84..e2b24b0e 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -32,7 +32,7 @@ Locales['de'] = { ['received_salary'] = 'du hast dein Gehalt erhalten: ~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.', - ['received_money'] = 'received money', + ['received_paycheck'] = 'received paycheck', ['bank'] = 'bank', ['black_money'] = 'dirty Money', diff --git a/locales/en.lua b/locales/en.lua index 7005a206..13224898 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -32,7 +32,7 @@ Locales['en'] = { ['received_salary'] = 'you received your salary: ~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.', - ['received_money'] = 'received money', + ['received_paycheck'] = 'received paycheck', ['bank'] = 'bank', ['black_money'] = 'dirty Money', diff --git a/locales/fi.lua b/locales/fi.lua index 9c2cece9..b41b6802 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -32,7 +32,7 @@ Locales['fi'] = { ['received_salary'] = 'sinä vastaanotit palkkaa: ~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.', - ['received_money'] = 'sai rahaa', + ['received_paycheck'] = 'sai rahaa', ['bank'] = 'Pankki', ['black_money'] = 'likainen Raha', diff --git a/locales/fr.lua b/locales/fr.lua index 9e72101c..dc54abec 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -31,8 +31,8 @@ Locales['fr'] = { -- Salary related ['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~', - ['company_nomoney'] = 'votre entreprise n\'a plus d\'argent pour vous payer!', -- fix translation - ['received_money'] = 'received money', + ['company_nomoney'] = 'votre entreprise n\'a plus d\'argent pour vous payer!', + ['received_paycheck'] = 'received paycheck', ['bank'] = 'banque', ['black_money'] = 'argent Sale', diff --git a/locales/sv.lua b/locales/sv.lua index 53f00495..6e46cdd3 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -32,7 +32,7 @@ Locales['sv'] = { ['received_salary'] = 'du har mottagit din lön 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.', - ['received_money'] = 'mottagit pengar', + ['received_paycheck'] = 'mottagit lön', ['bank'] = 'bank', ['black_money'] = 'svarta pengar', diff --git a/server/paycheck.lua b/server/paycheck.lua index df3cff43..04719d3b 100644 --- a/server/paycheck.lua +++ b/server/paycheck.lua @@ -11,7 +11,7 @@ ESX.StartPayCheck = function() if salary > 0 then if job == 'unemployed' then -- unemployed 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 TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society) if society ~= nil then -- verified society @@ -20,19 +20,19 @@ ESX.StartPayCheck = function() xPlayer.addAccountMoney('bank', 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 TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), '', _U('company_nomoney'), 'CHAR_BANK_MAZE', 1) end end) else -- not a society 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) else -- generic job 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