Minor changes, Swedish locale

This commit is contained in:
ElPumpo
2019-06-05 21:47:45 +02:00
parent 28d8dc8f99
commit b7c2e13578
11 changed files with 114 additions and 136 deletions
+2
View File
@@ -14,6 +14,7 @@ server_scripts {
'locales/en.lua',
'locales/fi.lua',
'locales/fr.lua',
'locales/sv.lua',
'server/main.lua'
}
@@ -25,6 +26,7 @@ client_scripts {
'locales/en.lua',
'locales/fi.lua',
'locales/fr.lua',
'locales/sv.lua',
'client/main.lua'
}
+41 -75
View File
File diff suppressed because one or more lines are too long
+4 -6
View File
@@ -4,12 +4,10 @@ Config.BankSavingPercentage = 2.5
Config.Locale = 'fr'
Config.Zones = {
BankActions = {
Pos = { x = 260.130, y = 204.308, z = 109.287 },
Size = { x = 1.5, y = 1.5, z = 1.0 },
Color = { r = 102, g = 102, b = 204 },
Type = 1
Coords = vector3(260.1, 204.3, 109.2),
Size = {x = 1.5, y = 1.5, z = 1.0},
Color = {r = 102, g = 102, b = 204},
Type = 1
}
}
+16 -19
View File
@@ -1,21 +1,18 @@
Locales['br'] = {
['actions'] = 'Ações',
['amount'] = 'Quantidade',
['balance'] = 'Saldo',
['bank'] = 'Banco',
['bill_amount'] = 'Montante de dinheiro',
['billing'] = 'Faturamento',
['customer'] = 'Cliente',
['customers'] = 'Clientes',
['deposit'] = 'Depositar',
['deposit_amount'] = 'Quantidade para depositar',
['deposit_society_money'] = 'Depositar dinheiro da sociedade',
['invalid_amount'] = 'Quantidade inválida',
['no_player_nearby'] = 'Nenhum jogador nas proximidades',
['press_input_context_to_open_menu'] = 'Pressione ~INPUT_CONTEXT~ para abrir o menu',
['property'] = 'Propriedade',
['wash_money'] = 'Lavagem de dinheiro',
['withdraw'] = 'Sacar',
['withdraw_amount'] = 'Quantidade para sacar',
['withdraw_society_money'] = 'Sacar dinheiro da sociedade',
['actions'] = 'ações',
['amount'] = 'quantidade',
['balance'] = 'saldo',
['bank'] = 'banco',
['bill_amount'] = 'montante de dinheiro',
['billing'] = 'faturamento',
['customer'] = 'cliente',
['customers'] = 'clientes',
['deposit'] = 'depositar',
['invalid_amount'] = 'quantidade inválida',
['no_player_nearby'] = 'nenhum jogador nas proximidades',
['press_input_context_to_open_menu'] = 'pressione ~INPUT_CONTEXT~ para abrir o menu',
['withdraw'] = 'sacar',
['boss_actions'] = 'boss Actions',
['phone_receive'] = 'bank Customer',
['phone_label'] = 'bank',
}
+3 -7
View File
@@ -8,15 +8,11 @@ Locales['de'] = {
['customer'] = 'Kunde',
['customers'] = 'Client',
['deposit'] = 'einzahlen',
['deposit_amount'] = 'Einzahlungsbetrag',
['deposit_society_money'] = 'Geld in Firma einzahlen',
['invalid_amount'] = 'ungültiger Betrag',
['no_player_nearby'] = 'kein Spieler in der Nähe',
['press_input_context_to_open_menu'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen',
['property'] = 'Immobilie',
['wash_money'] = 'Geld waschen',
['withdraw'] = 'Abheben',
['withdraw_amount'] = 'Abhebebetrag',
['withdraw_society_money'] = 'Firmengeld abheben',
['bank_customer'] = 'Bankkunde',
['boss_actions'] = 'boss Actions',
['phone_receive'] = 'Bankkunde',
['phone_label'] = 'bank',
}
+3 -8
View File
@@ -8,16 +8,11 @@ Locales['en'] = {
['customer'] = 'customer',
['customers'] = 'clients',
['deposit'] = 'deposit',
['deposit_amount'] = 'deposit amount',
['deposit_society_money'] = 'deposit society money',
['invalid_amount'] = 'invalid amount',
['no_player_nearby'] = 'no player nearby',
['press_input_context_to_open_menu'] = 'press ~INPUT_CONTEXT~ to open menu',
['property'] = 'property',
['wash_money'] = 'wash money',
['press_input_context_to_open_menu'] = 'press ~INPUT_CONTEXT~ to open the ~g~Bank Menu~s~.',
['withdraw'] = 'withdraw',
['withdraw_amount'] = 'withdraw amount',
['withdraw_society_money'] = 'withdraw society money',
['bank_customer'] = 'bank Customer',
['boss_actions'] = 'boss Actions',
['phone_receive'] = 'bank Customer',
['phone_label'] = 'bank',
}
+2 -7
View File
@@ -8,16 +8,11 @@ Locales['fi'] = {
['customer'] = 'asiakas',
['customers'] = 'asiakkaat',
['deposit'] = 'talletus',
['deposit_amount'] = 'talletus summa',
['deposit_society_money'] = 'talleta yhteiskunta rahaa',
['invalid_amount'] = 'virheellinen määrä',
['no_player_nearby'] = 'ei pelaajia lähettyvillä',
['press_input_context_to_open_menu'] = 'Paina ~INPUT_CONTEXT~ avataksesi valikon',
['property'] = 'kiinteistö',
['wash_money'] = 'pese rahaa',
['withdraw'] = 'nosta',
['withdraw_amount'] = 'noston määrä',
['withdraw_society_money'] = 'nosta yhteiskunnan rahaa',
['bank_customer'] = 'pankin asiakas',
['boss_actions'] = 'pomo valinnat',
['phone_receive'] = 'pankin asiakas',
['phone_label'] = 'bank',
}
+2 -7
View File
@@ -8,16 +8,11 @@ Locales['fr'] = {
['customer'] = 'client',
['customers'] = 'clients',
['deposit'] = 'virement',
['deposit_amount'] = 'montant du dépôt',
['deposit_society_money'] = 'déposer argent société',
['invalid_amount'] = 'montant invalide',
['no_player_nearby'] = 'aucun joueur à proximité',
['press_input_context_to_open_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour ouvrir le menu',
['property'] = 'propriété',
['wash_money'] = 'blanchir argent',
['withdraw'] = 'retrait',
['withdraw_amount'] = 'montant du retrait',
['withdraw_society_money'] = 'retirer argent société',
['bank_customer'] = 'client Banque',
['boss_actions'] = 'action Patron',
['phone_receive'] = 'client Banque',
['phone_label'] = 'banque',
}
+18
View File
@@ -0,0 +1,18 @@
Locales['sv'] = {
['actions'] = 'handling',
['amount'] = 'belopp',
['balance'] = 'balans',
['bank'] = 'bank',
['bill_amount'] = 'räkning belopp',
['billing'] = 'räkning',
['customer'] = 'kund',
['customers'] = 'kunder',
['deposit'] = 'insättning',
['invalid_amount'] = 'ogiltig belopp',
['no_player_nearby'] = 'det hittades inga spelare i närheten.',
['press_input_context_to_open_menu'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~g~bankmenyn~s~.',
['withdraw'] = 'ta ut',
['boss_actions'] = 'chef handlingar',
['phone_receive'] = 'bank meddelande mottaget',
['phone_label'] = 'bank',
}
+18
View File
@@ -0,0 +1,18 @@
USE `essentialmode`;
INSERT INTO `addon_account` (name, label, shared) VALUES
('society_banker','Bank',1),
('bank_savings','Bank',0)
;
INSERT INTO `jobs` (name, label) VALUES
('banker','Banktjänsteman')
;
INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
('banker',0,'advisor','Rådgivare',10,'{}','{}'),
('banker',1,'banker','Banktjänsteman',20,'{}','{}'),
('banker',2,'business_banker','Företagstjänsteman',30,'{}','{}'),
('banker',3,'trader','Köpman',40,'{}','{}'),
('banker',4,'boss','VD',0,'{}','{}')
;
+5 -7
View File
@@ -2,8 +2,8 @@ ESX = nil
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
TriggerEvent('esx_phone:registerNumber', 'banker', _('bank_customer'), false, false)
TriggerEvent('esx_society:registerSociety', 'banker', 'Banquier', 'society_banker', 'society_banker', 'society_banker', {type = 'public'})
TriggerEvent('esx_phone:registerNumber', 'banker', _('phone_receive'), false, false)
TriggerEvent('esx_society:registerSociety', 'banker', _U('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'})
RegisterServerEvent('esx_bankerjob:customerDeposit')
AddEventHandler('esx_bankerjob:customerDeposit', function (target, amount)
@@ -43,7 +43,7 @@ ESX.RegisterServerCallback('esx_bankerjob:getCustomers', function (source, cb)
local xPlayers = ESX.GetPlayers()
local customers = {}
for i=1, #xPlayers, 1 do
for i=1, #xPlayers do
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function(account)
@@ -81,12 +81,11 @@ function CalculateBankSavings(d, h, m)
else
local interests = math.floor(result[i].money / 100 * Config.BankSavingPercentage)
local newMoney = result[i].money + interests
bankInterests = bankInterests + interests
bankInterests = bankInterests + interests
local scope = function(newMoney, owner)
table.insert(asyncTasks, function(cb)
MySQL.Async.execute('UPDATE addon_account_data SET money = @money WHERE owner = @owner AND account_name = @account_name',
{
MySQL.Async.execute('UPDATE addon_account_data SET money = @money WHERE owner = @owner AND account_name = @account_name', {
['@money'] = newMoney,
['@owner'] = owner,
['@account_name'] = 'bank_savings',
@@ -107,7 +106,6 @@ function CalculateBankSavings(d, h, m)
Async.parallelLimit(asyncTasks, 5, function(results)
print('[BANK] Calculated interests')
end)
end)
end