Merge pull request #382 from roadtosixx/master

fix(es_extended + esx_allowlist) locales + finished transformation
This commit is contained in:
Benzo
2022-08-09 17:13:28 +02:00
committed by GitHub
11 changed files with 114 additions and 105 deletions
+39 -39
View File
@@ -29,7 +29,7 @@ Locales['de'] = {
['ex_inv_lim'] = 'aktion nicht möglich, Inventarlimit überschritten für %s',
['imp_invalid_quantity'] = 'aktion nicht möglich, ungültige Anzahl',
['imp_invalid_amount'] = 'aktion nicht möglich, ungültiger Betrag',
['threw_standard'] = 'you threw %sx %s',
['threw_standard'] = 'du wirfst %sx %s',
['threw_account'] = 'du wirfst $%s %s weg',
['threw_weapon'] = 'du wirfst %s weg',
['threw_weapon_ammo'] = 'du wirfst %s mit ~o~%sx %s weg',
@@ -54,52 +54,52 @@ Locales['de'] = {
['in_vehicle'] = 'du kannst keine Items in einem Fahrzeug weitergeben',
-- Commands
['command_car'] = 'spawn an vehicle',
['command_car'] = 'fahrzeug spawnen',
['command_car_car'] = 'vehicle spawn name or hash',
['command_cardel'] = 'delete vehicle in proximity',
['command_cardel_radius'] = 'optional, delete every vehicle within the specified radius',
['command_clear'] = 'clear chat',
['command_clearall'] = 'clear chat for all players',
['command_clearinventory'] = 'clear player inventory',
['command_clearloadout'] = 'clear a player loadout',
['command_giveaccountmoney'] = 'give account money',
['command_giveaccountmoney_account'] = 'valid account name',
['command_giveaccountmoney_amount'] = 'amount to add',
['command_giveaccountmoney_invalid'] = 'invalid account name',
['command_giveitem'] = 'give an item to a player',
['command_cardel'] = 'fahrzeuge in der nähe löschen',
['command_cardel_radius'] = 'optional, jedes fahrzeug innerhalb des angegebenen radius löschens',
['command_clear'] = 'chat leeren',
['command_clearall'] = 'chat leeren für alle spieler',
['command_clearinventory'] = 'spieler inventar leeren',
['command_clearloadout'] = 'spieler ausstattung löschen',
['command_giveaccountmoney'] = 'gebe guthaben',
['command_giveaccountmoney_account'] = 'gültiger account name',
['command_giveaccountmoney_amount'] = 'anzahl zum hinzufügen',
['command_giveaccountmoney_invalid'] = 'ungültiger account name',
['command_giveitem'] = 'gebe ein item zu einem spieler',
['command_giveitem_item'] = 'item name',
['command_giveitem_count'] = 'item count',
['command_giveweapon'] = 'give a weapon to a player',
['command_giveweapon_weapon'] = 'weapon name',
['command_giveweapon_ammo'] = 'ammo count',
['command_giveweapon_hasalready'] = 'player already has that weapon',
['command_giveweaponcomponent'] = 'give weapon component',
['command_giveitem_count'] = 'item anzahl',
['command_giveweapon'] = 'gebe waffe zu einem spieler',
['command_giveweapon_weapon'] = 'waffen name',
['command_giveweapon_ammo'] = 'munition anzahl',
['command_giveweapon_hasalready'] = 'spieler hat bereits diese waffe',
['command_giveweaponcomponent'] = 'gebe waffen component',
['command_giveweaponcomponent_component'] = 'component name',
['command_giveweaponcomponent_invalid'] = 'invalid weapon component',
['command_giveweaponcomponent_hasalready'] = 'player already has that weapon component',
['command_giveweaponcomponent_missingweapon'] = 'player does not have that weapon',
['command_save'] = 'save a player to database',
['command_saveall'] = 'save all players to database',
['command_setaccountmoney'] = 'set account money for a player',
['command_setaccountmoney_amount'] = 'amount of money to set',
['command_setcoords'] = 'teleport to coordinates',
['command_giveweaponcomponent_invalid'] = 'ungültiges waffen component',
['command_giveweaponcomponent_hasalready'] = 'spieler hat bereits dieses waffen komponent',
['command_giveweaponcomponent_missingweapon'] = 'spieler hat diese waffe nicht',
['command_save'] = 'spieler in die datenbank sichern',
['command_saveall'] = 'alle spieler in die datenbank sichern',
['command_setaccountmoney'] = 'guthaben für den spieler setzen',
['command_setaccountmoney_amount'] = 'guthaben zum setzen',
['command_setcoords'] = 'teleportieren zu koordinaten',
['command_setcoords_x'] = 'x axis',
['command_setcoords_y'] = 'y axis',
['command_setcoords_z'] = 'z axis',
['command_setjob'] = 'set job for a player',
['command_setjob'] = 'job für einen spieler setzen',
['command_setjob_job'] = 'job name',
['command_setjob_grade'] = 'job grade',
['command_setjob_invalid'] = 'the job, grade or both are invalid',
['command_setgroup'] = 'set player group',
['command_setgroup_group'] = 'group name',
['commanderror_argumentmismatch'] = 'argument count mismatch (passed %s, wanted %s)',
['commanderror_argumentmismatch_number'] = 'argument #%s type mismatch (passed string, wanted number)',
['commanderror_invaliditem'] = 'invalid item name',
['commanderror_invalidweapon'] = 'invalid weapon',
['commanderror_console'] = 'that command can not be run from console',
['commanderror_invalidcommand'] = '/%s is not an valid command!',
['commanderror_invalidplayerid'] = 'there is no player online matching that server id',
['commandgeneric_playerid'] = 'player id',
['command_setjob_invalid'] = 'der job, grade oder beides ist ungültig',
['command_setgroup'] = 'setze spieler gruppe',
['command_setgroup_group'] = 'gruppen name',
['commanderror_argumentmismatch'] = 'argumentanzahl stimmt nicht überein (übergeben %s, gesucht %s)',
['commanderror_argumentmismatch_number'] = 'argument #%s typ stimmt nicht überein (übergeben string, gewünscht zahl)',
['commanderror_invaliditem'] = 'falscher item name',
['commanderror_invalidweapon'] = 'ungültige waffe',
['commanderror_console'] = 'der command kann nicht von der konsole ausgeführt werden',
['commanderror_invalidcommand'] = '/%s ist kein verfügbarer command!',
['commanderror_invalidplayerid'] = 'kein spieler online mit dieser id',
['commandgeneric_playerid'] = 'spieler id',
-- Locale settings
['locale_digit_grouping_symbol'] = ' ',
+5 -5
View File
@@ -1,9 +1,9 @@
Locales['br'] = {
['whitelist_check'] = 'certificando-se de que você está na lista de permitidos(whitelist) neste servidor. . .',
['not_whitelisted'] = 'você não está na lista de permitidos(whitelist) neste servidor',
['allowlist_check'] = 'certificando-se de que você está na lista de permitidos(allowlist) neste servidor. . .',
['not_allowlisted'] = 'você não está na lista de permitidos(allowlist) neste servidor',
['steamid_error'] = 'seu ID do Steam não foi encontrado, o Steam está aberto?',
['whitelist_empty'] = 'a lista de permitidos(whitelist) ainda não foi carregada ou ninguém foi incluído!',
['help_whitelist_add'] = 'adicionar alguém à lista de permitidos(whitelist) no servidor',
['help_whitelist_load'] = 'recarregar a lista de permitidos(whitelist)',
['allowlist_empty'] = 'a lista de permitidos(allowlist) ainda não foi carregada ou ninguém foi incluído!',
['help_allowlist_add'] = 'adicionar alguém à lista de permitidos(allowlist) no servidor',
['help_allowlist_load'] = 'recarregar a lista de permitidos(allowlist)',
}
@@ -0,0 +1,9 @@
Locales['de'] = {
['allowlist_check'] = 'Überprüfe ob sie auf der Allowlist sind...',
['not_allowlisted'] = 'Sie müssen auf der Allowlist sein, um diesem Server beizutreten!',
['allowlist_empty'] = 'Für diesen Server sind keine allowlists gespeichert.',
['license_missing'] = 'Error: Ihr Identifier fehlt.',
['help_allowlist_add'] = 'jemanden zur Allowlist hinzufügen',
['help_allowlist_load'] = 'reloade die allowlist',
}
+5 -5
View File
@@ -1,8 +1,8 @@
Locales['en'] = {
['whitelist_check'] = 'Checking you are Allowlisted.',
['not_whitelisted'] = 'You Must be Allowlisted to join this server!',
['whitelist_empty'] = 'There Are no whitelists saved for this server.',
['allowlist_check'] = 'Checking you are Allowlisted.',
['not_allowlisted'] = 'You Must be Allowlisted to join this server!',
['allowlist_empty'] = 'There Are no allowlists saved for this server.',
['license_missing'] = 'Error: Your Identifier is missing!',
['help_whitelist_add'] = 'add someone to the whitelist',
['help_whitelist_load'] = 'reload the whitelist',
['help_allowlist_add'] = 'add someone to the allowlist',
['help_allowlist_load'] = 'reload the allowlist',
}
+5 -5
View File
@@ -1,8 +1,8 @@
Locales['es'] = {
['whitelist_check'] = 'revisando si tienes la whitelist . . .',
['not_whitelisted'] = 'no tenes la whitelist en este servidor',
['whitelist_empty'] = 'La whitelist todavia no cargo, o alternativamente nadie la tiene',
['allowlist_check'] = 'revisando si tienes la allowlist . . .',
['not_allowlisted'] = 'no tenes la allowlist en este servidor',
['allowlist_empty'] = 'La allowlist todavia no cargo, o alternativamente nadie la tiene',
['license_missing'] = 'no se pudo encontrar tu licencia',
['help_whitelist_add'] = 'agregar a la whitelist',
['help_whitelist_load'] = 'recargar whitelist',
['help_allowlist_add'] = 'agregar a la allowlist',
['help_allowlist_load'] = 'recargar allowlist',
}
+5 -5
View File
@@ -1,8 +1,8 @@
Locales['fr'] = {
['whitelist_check'] = 'Etes vous sûr d\'être whitelisté sur ce serveur ...',
['not_whitelisted'] = 'Ce serveur utilise une whitelist',
['whitelist_empty'] = 'La whitelist n\'a pas été rechargé ou vous n\'avez pas été whitelisté',
['allowlist_check'] = 'Etes vous sûr d\'être allowlisté sur ce serveur ...',
['not_allowlisted'] = 'Ce serveur utilise une allowlist',
['allowlist_empty'] = 'La allowlist n\'a pas été rechargé ou vous n\'avez pas été allowlisté',
['license_missing'] = 'Votre license est introuvable',
['help_whitelist_add'] = 'Ajouter un joueur à la Whitelist',
['help_whitelist_load'] = 'Recharger la Whitelist',
['help_allowlist_add'] = 'Ajouter un joueur à la Whitelist',
['help_allowlist_load'] = 'Recharger la Whitelist',
}
+5 -5
View File
@@ -1,8 +1,8 @@
Locales['hu'] = {
['whitelist_check'] = 'Ellenőrzi, hogy fent vagy-e az engedélyezett listára.',
['not_whitelisted'] = 'Engedélyezettnek kell lenned ahhoz, hogy csatlakozz ehhez a szerverhez!',
['whitelist_empty'] = 'Ehhez a szerverhez nincsenek mentett engedélyezési listák.',
['allowlist_check'] = 'Ellenőrzi, hogy fent vagy-e az engedélyezett listára.',
['not_allowlisted'] = 'Engedélyezettnek kell lenned ahhoz, hogy csatlakozz ehhez a szerverhez!',
['allowlist_empty'] = 'Ehhez a szerverhez nincsenek mentett engedélyezési listák.',
['license_missing'] = 'Hiba: Te Identifier-ed hiányzik!',
['help_whitelist_add'] = 'jétékos felvéltele a whitelist-re',
['help_whitelist_load'] = 'whitelist újratöltése',
['help_allowlist_add'] = 'jétékos felvéltele a allowlist-re',
['help_allowlist_load'] = 'allowlist újratöltése',
}
+5 -5
View File
@@ -1,8 +1,8 @@
Locales['si'] = {
['whitelist_check'] = 'Preverja se, ali ste na seznamu dovoljenj.',
['not_whitelisted'] = 'Če se želite pridružiti temu strežniku, morate biti uvrščeni na seznam dovoljenj!',
['whitelist_empty'] = 'Za ta strežnik ni shranjenih belih seznamov.',
['allowlist_check'] = 'Preverja se, ali ste na seznamu dovoljenj.',
['not_allowlisted'] = 'Če se želite pridružiti temu strežniku, morate biti uvrščeni na seznam dovoljenj!',
['allowlist_empty'] = 'Za ta strežnik ni shranjenih belih seznamov.',
['license_missing'] = 'Napaka: Manjka vaš identifikator!',
['help_whitelist_add'] = 'Dodaj nekoga na beli seznam',
['help_whitelist_load'] = 'ponovno naložite belo listo',
['help_allowlist_add'] = 'Dodaj nekoga na beli seznam',
['help_allowlist_load'] = 'ponovno naložite belo listo',
}
+5 -5
View File
@@ -1,8 +1,8 @@
Locales['sv'] = {
['whitelist_check'] = 'Ser till att du är vitlistad på den här servern. . .',
['not_whitelisted'] = 'Du är inte vitlistad på den här servern',
['whitelist_empty'] = 'Vitlistan har inte laddats ännu, eller alternativt har ingen blivit vitlistad!',
['allowlist_check'] = 'Ser till att du är vitlistad på den här servern. . .',
['not_allowlisted'] = 'Du är inte vitlistad på den här servern',
['allowlist_empty'] = 'Vitlistan har inte laddats ännu, eller alternativt har ingen blivit vitlistad!',
['license_missing'] = 'Din licens kunde inte hittas',
['help_whitelist_add'] = 'Lägg till någon på vitlistan',
['help_whitelist_load'] = 'Ladda om vitlistan',
['help_allowlist_add'] = 'Lägg till någon på vitlistan',
['help_allowlist_load'] = 'Ladda om vitlistan',
}
+5 -5
View File
@@ -1,8 +1,8 @@
Locales['tr'] = {
['whitelist_check'] = 'bu sunucuda beyaz listede olduğunuzdan emin olunuluyor . . .',
['not_whitelisted'] = 'bu sunucuda beyaz listede değilsiniz',
['whitelist_empty'] = 'beyaz liste henüz yüklenmedi yada beyaz listede kimse bulunmuyor',
['allowlist_check'] = 'bu sunucuda beyaz listede olduğunuzdan emin olunuluyor . . .',
['not_allowlisted'] = 'bu sunucuda beyaz listede değilsiniz',
['allowlist_empty'] = 'beyaz liste henüz yüklenmedi yada beyaz listede kimse bulunmuyor',
['license_missing'] = 'lisansınız bulunamadı',
['help_whitelist_add'] = 'beyaz listeye birini ekle',
['help_whitelist_load'] = 'beyaz listeyi tekrardan yükle',
['help_allowlist_add'] = 'beyaz listeye birini ekle',
['help_allowlist_load'] = 'beyaz listeyi tekrardan yükle',
}
+26 -26
View File
@@ -1,15 +1,15 @@
WhiteList = {}
local AllowList = {}
function loadWhiteList()
WhiteList = nil
function loadAllowList()
AllowList = nil
local List = LoadResourceFile(GetCurrentResourceName(),'players.json')
if List then
WhiteList = json.decode(List)
AllowList = json.decode(List)
end
end
loadWhiteList()
loadAllowList()
AddEventHandler('playerConnecting', function(name, setCallback, deferrals)
if #(GetPlayers()) < Config.MinPlayer then
@@ -21,19 +21,19 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals)
local playerId, kickReason = source, "There Was An Error, Please Contact the server owner!"
-- Letting the user know what's going on.
deferrals.update(_U('whitelist_check'))
deferrals.update(_U('allowlist_check'))
-- Needed, not sure why.
Wait(100)
local identifier = ESX.GetIdentifier(playerId)
if ESX.Table.SizeOf(WhiteList) == 0 then
kickReason = _U('whitelist_empty')
if ESX.Table.SizeOf(AllowList) == 0 then
kickReason = _U('allowlist_empty')
elseif not identifier then
kickReason = _U('license_missing')
elseif not WhiteList[identifier] then
kickReason = _U('not_whitelisted')
elseif not AllowList[identifier] then
kickReason = _U('not_allowlist')
end
if kickReason then
@@ -44,35 +44,35 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals)
end
end)
ESX.RegisterCommand('wlrefresh', 'admin', function(xPlayer, args)
loadWhiteList()
print('[esx_whitelist] Whitelist Refreshed!')
end, true, {help = _U('help_whitelist_load')})
ESX.RegisterCommand('alrefresh', 'admin', function(xPlayer, args)
loadAllowList()
print('[esx_allowlist] Allowlist Refreshed!')
end, true, {help = _U('help_allowlist_load')})
ESX.RegisterCommand('wladd', 'admin', function(xPlayer, args, showError)
ESX.RegisterCommand('aladd', 'admin', function(xPlayer, args, showError)
args.license = args.license:lower()
if WhiteList[args.license] then
if AllowList[args.license] then
showError('The player is already allowlisted on this server!')
else
WhiteList[args.license] = true
SaveResourceFile(GetCurrentResourceName(), 'players.json', json.encode(WhiteList))
loadWhiteList()
AllowList[args.license] = true
SaveResourceFile(GetCurrentResourceName(), 'players.json', json.encode(AllowList))
loadAllowList()
end
end, true, {help = _U('help_whitelist_add'), validate = true, arguments = {
end, true, {help = _U('help_allowlist_add'), validate = true, arguments = {
{name = 'license', help = 'the player license', type = 'string'}
}})
ESX.RegisterCommand('wlremove', 'admin', function(xPlayer, args, showError)
ESX.RegisterCommand('alremove', 'admin', function(xPlayer, args, showError)
args.license = args.license:lower()
if WhiteList[args.license] then
WhiteList[args.license] = nil
SaveResourceFile(GetCurrentResourceName(), 'players.json', json.encode(WhiteList))
loadWhiteList()
if AllowList[args.license] then
AllowList[args.license] = nil
SaveResourceFile(GetCurrentResourceName(), 'players.json', json.encode(AllowList))
loadAllowList()
else
showError('Identifier is not Allowlisted on this server!')
end
end, true, {help = _U('help_whitelist_add'), validate = true, arguments = {
end, true, {help = _U('help_allowlist_add'), validate = true, arguments = {
{name = 'license', help = 'the player license', type = 'string'}
}})