2 space locale indent, minor changes

This commit is contained in:
ElPumpo
2019-02-28 21:21:12 +01:00
parent 60c4f52c6b
commit ef8fba47f6
11 changed files with 99 additions and 101 deletions
+7 -9
View File
@@ -34,15 +34,13 @@ Client side
```lua
RegisterNetEvent('esx_phone:loaded')
AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts)
local specialContact = {
name = 'societyName',
number = 'societyNumber',
base64Icon = 'insert base 64 icon'
}
local specialContact = {
name = 'societyName',
number = 'societyNumber',
base64Icon = 'insert base 64 icon (PNG recommended)'
}
TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon)
TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon)
end)
```
@@ -62,7 +60,7 @@ last two booleans are optional
### License
esx_phone - phone script for fivem
Copyright (C) 2015-2018 Jérémie N'gadi
Copyright (C) 2015-2019 Jérémie N'gadi
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+8 -8
View File
@@ -161,10 +161,10 @@ AddEventHandler('esx_phone:onMessage', function(phoneNumber, message, position,
if job == 'player' then
ESX.ShowNotification(_U('new_message', message))
else
ESX.ShowNotification('~b~' .. job .. ': ~s~' .. message)
ESX.ShowNotification(('~b~%s:~s~ %s'):format(job, message))
end
PlaySound(-1, "Menu_Accept", "Phone_SoundSet_Default", 0, 0, 1)
PlaySound(-1, 'Menu_Accept', 'Phone_SoundSet_Default', false, 0, true)
SendNUIMessage({
newMessage = true,
@@ -181,12 +181,12 @@ AddEventHandler('esx_phone:onMessage', function(phoneNumber, message, position,
CurrentDispatchRequestId = dispatchRequestId
CurrentActionData = {
phoneNumber = phoneNumber,
message = message,
position = position,
actions = actions,
anonyme = anon,
job = job
phoneNumber = phoneNumber,
message = message,
position = position,
actions = actions,
anonyme = anon,
job = job
}
ESX.SetTimeout(15000, function()
+4 -4
View File
@@ -24,7 +24,7 @@ html, body {
}
#phone {
background-image: url(../img/phone.png);
background-image: url("../img/phone.png");
background-repeat: no-repeat;
font-family: 'Catamaran', sans-serif;
font-weight: 400;
@@ -243,7 +243,7 @@ html, body {
text-align: center;
}
.message .sender-info, .message .body, .contact .sender-info, {
.message .sender-info, .message .body, .contact .sender-info {
margin-right: 30px;
}
@@ -285,7 +285,7 @@ html, body {
display: none;
width: 24px;
height: 24px;
background: transparent url(../img/icons/location.png) no-repeat 50%;
background: transparent url("../img/icons/location.png") no-repeat 50%;
cursor: pointer;
}
@@ -293,7 +293,7 @@ html, body {
display: none;
width: 24px;
height: 24px;
background: transparent url(../img/icons/ok.png) no-repeat 50%;
background: transparent url("../img/icons/ok.png") no-repeat 50%;
cursor: pointer;
}
+11 -11
View File
@@ -1,13 +1,13 @@
Locales['br'] = {
['new_message'] = '~b~Nova mensagem :~s~ %s',
['press_take_call'] = '%s - Pressione ~INPUT_CONTEXT~ para aceitar a chamada',
['taken_call'] = '~y~%s~s~ recebeu uma chamada',
['gps_position'] = 'destino inserido no GPS',
['message_sent'] = 'mensagem enviada',
['cannot_add_self'] = 'você não pode se adicionar',
['number_in_contacts'] = 'este número já está na sua lista de contatos',
['contact_added'] = 'contato adicionado',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'este número não foi atribuído...',
['invalid_number'] = 'that\'s not an valid number!',
['new_message'] = '~b~Nova mensagem :~s~ %s',
['press_take_call'] = '%s - Pressione ~INPUT_CONTEXT~ para aceitar a chamada',
['taken_call'] = '~y~%s~s~ recebeu uma chamada',
['gps_position'] = 'destino inserido no GPS',
['message_sent'] = 'mensagem enviada',
['cannot_add_self'] = 'você não pode se adicionar',
['number_in_contacts'] = 'este número já está na sua lista de contatos',
['contact_added'] = 'contato adicionado',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'este número não foi atribuído...',
['invalid_number'] = 'that\'s not an valid number!',
}
+11 -11
View File
@@ -1,13 +1,13 @@
Locales['de'] = {
['new_message'] = '~b~Neue Nachricht',
['press_take_call'] = '%s - Drücke ~INPUT_CONTEXT~ um den Anruf anzunehmen',
['taken_call'] = '~y~%s~s~ hat den Anruf angenommen',
['gps_position'] = 'ziel in GPS eingegeben',
['message_sent'] = 'nachricht gesendet',
['cannot_add_self'] = 'du kannst dich nicht selbst hinzufügen',
['number_in_contacts'] = 'diese Nummer ist bereits in deinen Kontakten',
['contact_added'] = 'kontakt hinzugefügt',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'diese Nummer ist nicht vergeben...',
['invalid_number'] = 'that\'s not an valid number!',
['new_message'] = '~b~Neue Nachricht',
['press_take_call'] = '%s - Drücke ~INPUT_CONTEXT~ um den Anruf anzunehmen',
['taken_call'] = '~y~%s~s~ hat den Anruf angenommen',
['gps_position'] = 'ziel in GPS eingegeben',
['message_sent'] = 'nachricht gesendet',
['cannot_add_self'] = 'du kannst dich nicht selbst hinzufügen',
['number_in_contacts'] = 'diese Nummer ist bereits in deinen Kontakten',
['contact_added'] = 'kontakt hinzugefügt',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'diese Nummer ist nicht vergeben...',
['invalid_number'] = 'that\'s not an valid number!',
}
+12 -12
View File
@@ -1,13 +1,13 @@
Locales['en'] = {
['new_message'] = '~b~You have recived a message:~s~ %s',
['press_take_call'] = '%s - Press ~INPUT_CONTEXT~ to take the call',
['taken_call'] = '~y~%s~s~ has taken the call',
['gps_position'] = 'the destination has been added to your GPS',
['message_sent'] = 'the message has been sent',
['cannot_add_self'] = 'you can not add yourself!',
['number_in_contacts'] = 'this number is already in your contact list',
['contact_added'] = 'the contact has been added!',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'the number has not been assigned!',
['invalid_number'] = 'that\'s not an valid number!',
}
['new_message'] = '~b~You have recived a message:~s~ %s',
['press_take_call'] = '%s - Press ~INPUT_CONTEXT~ to take the call',
['taken_call'] = '~y~%s~s~ has taken the call',
['gps_position'] = 'the destination has been added to your GPS',
['message_sent'] = 'the message has been sent',
['cannot_add_self'] = 'you can not add yourself!',
['number_in_contacts'] = 'this number is already in your contact list',
['contact_added'] = 'the contact has been added!',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'the number has not been assigned!',
['invalid_number'] = 'that\'s not an valid number!',
}
+11 -11
View File
@@ -1,13 +1,13 @@
Locales['es'] = {
['new_message'] = '~b~Nuevo menaje :~s~ %s',
['press_take_call'] = '%s - Presionar ~INPUT_CONTEXT~ para coger la llamada',
['taken_call'] = '~y~%s~s~ has contestado la llamada',
['gps_position'] = 'posición GPS',
['message_sent'] = 'mensaje enviado',
['cannot_add_self'] = 'no has podido agregar',
['number_in_contacts'] = 'este número ya está en tu lista de contactos',
['contact_added'] = 'contacto añadido',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'el número no se ha añadido todavía...',
['invalid_number'] = 'that\'s not an valid number!',
['new_message'] = '~b~Nuevo menaje :~s~ %s',
['press_take_call'] = '%s - Presionar ~INPUT_CONTEXT~ para coger la llamada',
['taken_call'] = '~y~%s~s~ has contestado la llamada',
['gps_position'] = 'posición GPS',
['message_sent'] = 'mensaje enviado',
['cannot_add_self'] = 'no has podido agregar',
['number_in_contacts'] = 'este número ya está en tu lista de contactos',
['contact_added'] = 'contacto añadido',
['contact_removed'] = 'the contact has been removed!',
['number_not_assigned'] = 'el número no se ha añadido todavía...',
['invalid_number'] = 'that\'s not an valid number!',
}
+11 -11
View File
@@ -1,13 +1,13 @@
Locales['fr'] = {
['new_message'] = '~b~Nouveau message :~s~ %s',
['press_take_call'] = '%s - Appuyez sur ~INPUT_CONTEXT~ pour prendre l\'appel',
['taken_call'] = '~y~%s~s~ a pris l\'appel',
['gps_position'] = 'position entrée dans le GPS',
['message_sent'] = 'message envoyé',
['cannot_add_self'] = 'vous ne pouvez pas vous ajouter vous-même',
['number_in_contacts'] = 'ce numéro est déja dans votre liste de contacts',
['contact_added'] = 'contact ajouté',
['contact_removed'] = 'contact supprimé',
['number_not_assigned'] = 'ce numéro n\'est pas attribué...',
['invalid_number'] = 'that\'s not an valid number!',
['new_message'] = '~b~Nouveau message :~s~ %s',
['press_take_call'] = '%s - Appuyez sur ~INPUT_CONTEXT~ pour prendre l\'appel',
['taken_call'] = '~y~%s~s~ a pris l\'appel',
['gps_position'] = 'position entrée dans le GPS',
['message_sent'] = 'message envoyé',
['cannot_add_self'] = 'vous ne pouvez pas vous ajouter vous-même',
['number_in_contacts'] = 'ce numéro est déja dans votre liste de contacts',
['contact_added'] = 'contact ajouté',
['contact_removed'] = 'contact supprimé',
['number_not_assigned'] = 'ce numéro n\'est pas attribué...',
['invalid_number'] = 'that\'s not an valid number!',
}
+11 -11
View File
@@ -1,13 +1,13 @@
Locales['pl'] = {
['new_message'] = '~b~Masz nową wiadomość:~s~ %s',
['press_take_call'] = '%s - wciśnij ~INPUT_CONTEXT~ aby odebrać telefon',
['taken_call'] = '~y~%s~s~ odebrał telefon',
['gps_position'] = 'cel podróży został dodany do GPS\'a',
['message_sent'] = 'wiadomość wysłana',
['cannot_add_self'] = 'nie możesz dodać samego siebie!',
['number_in_contacts'] = 'ten numer jest już na twojej liście kontaktów',
['contact_added'] = 'kontakt dodany!',
['contact_removed'] = 'kontakt usunięty!',
['number_not_assigned'] = 'numer nie jest przypisany!',
['invalid_number'] = 'to nie jest prawidłowy numer telefonu!',
['new_message'] = '~b~Masz nową wiadomość:~s~ %s',
['press_take_call'] = '%s - wciśnij ~INPUT_CONTEXT~ aby odebrać telefon',
['taken_call'] = '~y~%s~s~ odebrał telefon',
['gps_position'] = 'cel podróży został dodany do GPS\'a',
['message_sent'] = 'wiadomość wysłana',
['cannot_add_self'] = 'nie możesz dodać samego siebie!',
['number_in_contacts'] = 'ten numer jest już na twojej liście kontaktów',
['contact_added'] = 'kontakt dodany!',
['contact_removed'] = 'kontakt usunięty!',
['number_not_assigned'] = 'numer nie jest przypisany!',
['invalid_number'] = 'to nie jest prawidłowy numer telefonu!',
}
+12 -12
View File
@@ -1,13 +1,13 @@
Locales['sv'] = {
['new_message'] = '~b~Nytt meddelande:~s~ %s',
['press_take_call'] = '%s - tryck ~INPUT_CONTEXT~ för att svara',
['taken_call'] = '~y~%s~s~ har tagit emot ditt meddelande',
['gps_position'] = 'destinationen är markerad på din GPS!',
['message_sent'] = 'meddelandet har skickats!',
['cannot_add_self'] = 'du kan inte lägga till dig själv!',
['number_in_contacts'] = 'det här nummret finns redan bland dina kontakter!',
['contact_added'] = 'kontakten har lags till!',
['contact_removed'] = 'kontakten har tagits bort!',
['number_not_assigned'] = 'det här nummret finns inte!',
['invalid_number'] = 'det är inte ett giltigt nummer!',
}
['new_message'] = '~b~Nytt meddelande:~s~ %s',
['press_take_call'] = '%s - tryck ~INPUT_CONTEXT~ för att svara',
['taken_call'] = '~y~%s~s~ har tagit emot ditt meddelande',
['gps_position'] = 'destinationen är markerad på din GPS!',
['message_sent'] = 'meddelandet har skickats!',
['cannot_add_self'] = 'du kan inte lägga till dig själv!',
['number_in_contacts'] = 'det här nummret finns redan bland dina kontakter!',
['contact_added'] = 'kontakten har lags till!',
['contact_removed'] = 'kontakten har tagits bort!',
['number_not_assigned'] = 'det här nummret finns inte!',
['invalid_number'] = 'det är inte ett giltigt nummer!',
}
+1 -1
View File
@@ -6,7 +6,7 @@ function LoadPlayer(source)
local xPlayer = ESX.GetPlayerFromId(source)
for num,v in pairs(PhoneNumbers) do
if tonumber(num) == num then -- If phonenumber is a player phone number
if tonumber(num) == num then -- if phonenumber is a player phone number
for src,_ in pairs(v.sources) do
TriggerClientEvent('esx_phone:setPhoneNumberSource', source, num, tonumber(src))
end