diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index e896bd5c8..174e07d70 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -37,4 +37,8 @@ 12. [ox_inventory]: chore: remove store dmvshool @bitpredator 13. [BasicItem]: chore: code cleanup and fixes @bitpredator 14. [BOBHunt]: refactor: code cleaning, various corrections to the code as well as license updates @bitpredator -15. [BOBHunt]: refactor: supports all translations natively @bitpredator \ No newline at end of file +15. [BOBHunt]: refactor: supports all translations natively @bitpredator +16. [SQL]: chore: removed white strings inside some sql @bitpredator +17. [esx_addoninventory]: delete: removed the .editorconfig file @bitpredator +18. [ox_inventory]: fix: corrected the weight of the items @bitpredator +19. [esx_identity]: chore: update the code version and improve the formatting @bitpredator \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_ballasjob/bpt_ballasjob.sql b/server-data/resources/[bpt_addons]/bpt_ballasjob/bpt_ballasjob.sql index 376179d9d..51dcb6ab8 100644 --- a/server-data/resources/[bpt_addons]/bpt_ballasjob/bpt_ballasjob.sql +++ b/server-data/resources/[bpt_addons]/bpt_ballasjob/bpt_ballasjob.sql @@ -1,5 +1,3 @@ - - INSERT INTO `addon_account` (name, label, shared) VALUES ('society_ballas', 'Ballas', 1) ; diff --git a/server-data/resources/[bpt_addons]/bpt_dustman/bpt_dustmanjob.sql b/server-data/resources/[bpt_addons]/bpt_dustman/bpt_dustmanjob.sql index e1d438498..31c24b433 100644 --- a/server-data/resources/[bpt_addons]/bpt_dustman/bpt_dustmanjob.sql +++ b/server-data/resources/[bpt_addons]/bpt_dustman/bpt_dustmanjob.sql @@ -1,5 +1,3 @@ - - INSERT INTO `addon_account` (name, label, shared) VALUES ('society_dustman', 'Dustman', 1) ; diff --git a/server-data/resources/[bpt_addons]/bpt_importjob/bpt_importjob.sql b/server-data/resources/[bpt_addons]/bpt_importjob/bpt_importjob.sql index c54882d02..06bcd8f0b 100644 --- a/server-data/resources/[bpt_addons]/bpt_importjob/bpt_importjob.sql +++ b/server-data/resources/[bpt_addons]/bpt_importjob/bpt_importjob.sql @@ -1,5 +1,3 @@ - - INSERT INTO `addon_account` (name, label, shared) VALUES ('society_import', 'Import', 1) ; diff --git a/server-data/resources/[bpt_addons]/bpt_unicornjob/bpt_unicornjob.sql b/server-data/resources/[bpt_addons]/bpt_unicornjob/bpt_unicornjob.sql index bbe9d4b01..2144fdc40 100644 --- a/server-data/resources/[bpt_addons]/bpt_unicornjob/bpt_unicornjob.sql +++ b/server-data/resources/[bpt_addons]/bpt_unicornjob/bpt_unicornjob.sql @@ -1,5 +1,3 @@ - - INSERT INTO `addon_account` (name, label, shared) VALUES ('society_unicorn', 'Unicorn', 1) ; diff --git a/server-data/resources/[esx]/esx_identity/LICENSE b/server-data/resources/[esx]/esx_identity/LICENSE index 9cba2328a..4dc529f08 100644 --- a/server-data/resources/[esx]/esx_identity/LICENSE +++ b/server-data/resources/[esx]/esx_identity/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_identity - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_identity Copyright (C) 2015-2022 Jérémie N'gadi + esx_identity Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/server-data/resources/[esx]/esx_identity/README.md b/server-data/resources/[esx]/esx_identity/README.md index c73c43306..9fd9cc2bf 100644 --- a/server-data/resources/[esx]/esx_identity/README.md +++ b/server-data/resources/[esx]/esx_identity/README.md @@ -1,14 +1,14 @@ -

[ESX] Identity

Discord - Website - Documentation +

[ESX] Identity

Discord - Documentation A Core Resource that Allows the player to Pick their characters, Name, Gender, Height and Date-of-birth. -![Preview](https://cdn.discordapp.com/attachments/714118962568364106/997871502798094426/Screenshot_51.png) +![Preview](./preview.png) # Infomation ## Requirements - [esx_skin](./../esx_skin/README.md) +[esx_skin](./../esx_skin/README.md) ## Commands @@ -21,7 +21,7 @@ A Core Resource that Allows the player to Pick their characters, Name, Gender, H esx_identity - Make your Character a Person! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 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. diff --git a/server-data/resources/[esx]/esx_identity/client/main.lua b/server-data/resources/[esx]/esx_identity/client/main.lua index 247f79f88..114754911 100644 --- a/server-data/resources/[esx]/esx_identity/client/main.lua +++ b/server-data/resources/[esx]/esx_identity/client/main.lua @@ -44,14 +44,14 @@ if not Config.UseDeferrals then RegisterNetEvent('esx_identity:showRegisterIdentity', function() TriggerEvent('esx_skin:resetFirstSpawn') - while not ready do + while not (ready and loadingScreenFinished) do print('Waiting for esx_identity NUI..') Wait(100) end if not ESX.PlayerData.dead then setGuiState(true) end end) - RegisterNUICallback('register', function(data) + RegisterNUICallback('register', function(data,cb) if not guiEnabled then return end @@ -68,5 +68,6 @@ if not Config.UseDeferrals then TriggerEvent('esx_skin:playerRegistered') end end, data) + cb(1) end) end diff --git a/server-data/resources/[esx]/esx_identity/config.lua b/server-data/resources/[esx]/esx_identity/config.lua index efa7f3379..59be664e9 100644 --- a/server-data/resources/[esx]/esx_identity/config.lua +++ b/server-data/resources/[esx]/esx_identity/config.lua @@ -13,11 +13,11 @@ Config.UseDeferrals = false Config.DateFormat = 'DD/MM/YYYY' -- These values are for the second input validation in server/main.lua -Config.MaxNameLength = 20 -- Max Name Length. -Config.MinHeight = 120 -- 120 cm lowest height -Config.MaxHeight = 220 -- 220 cm max height. -Config.LowestYear = 1900 -- 112 years old is the oldest you can be. -Config.HighestYear = 2005 -- 18 years old is the youngest you can be. +Config.MaxNameLength = 20 -- Max Name Length. +Config.MinHeight = 120 -- 120 cm lowest height +Config.MaxHeight = 220 -- 220 cm max height. +Config.LowestYear = 1900 -- 112 years old is the oldest you can be. +Config.HighestYear = 2005 -- 18 years old is the youngest you can be. -Config.FullCharDelete = true -- Delete all reference to character. -Config.EnableDebugging = ESX.GetConfig().EnableDebug -- prints for debugging :) +Config.FullCharDelete = true -- Delete all reference to character. +Config.EnableDebugging = ESX.GetConfig().EnableDebug -- prints for debugging :) diff --git a/server-data/resources/[esx]/esx_identity/fxmanifest.lua b/server-data/resources/[esx]/esx_identity/fxmanifest.lua index b58ffb762..b3b491d38 100644 --- a/server-data/resources/[esx]/esx_identity/fxmanifest.lua +++ b/server-data/resources/[esx]/esx_identity/fxmanifest.lua @@ -1,10 +1,9 @@ fx_version 'adamant' game 'gta5' - description 'ESX Identity' lua54 'yes' -version '0.0.4' +version '1.0.0' shared_scripts { '@es_extended/imports.lua', diff --git a/server-data/resources/[esx]/esx_identity/html/css/style.css b/server-data/resources/[esx]/esx_identity/html/css/style.css index 1a7fff35b..45f2404a0 100644 --- a/server-data/resources/[esx]/esx_identity/html/css/style.css +++ b/server-data/resources/[esx]/esx_identity/html/css/style.css @@ -1,153 +1,153 @@ @import url("https://fonts.googleapis.com/css2?family=Oswald&display=swap"); body { - font-family: sans-serif; - overflow: hidden; - background-color: transparent; + font-family: sans-serif; + overflow: hidden; + background-color: transparent; } .none { - display: none; + display: none; } .dialog { - width: 332px; - opacity: 0.95; - padding: 20px; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - background-color: #152029; - border-radius: 10px; - box-shadow: 0 -5px 3px -3px #21303d, 0 5px 3px -3px #21303d; - border: none; - color: #ffffff; + width: 332px; + opacity: 0.95; + padding: 20px; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: #152029; + border-radius: 10px; + box-shadow: 0 -5px 3px -3px #21303d, 0 5px 3px -3px #21303d; + border: none; + color: #ffffff; } .title { - font-family: "Oswald", sans-serif; - font-size: 22px; - text-align: center; - padding: 5px; - margin-bottom: 20px; + font-family: "Oswald", sans-serif; + font-size: 22px; + text-align: center; + padding: 5px; + margin-bottom: 20px; } input { - margin-bottom: 15px; - border: none; - border-bottom: 2px solid #58636c; - width: 100%; - outline: none; - padding: 10px; - padding-left: 0; - font-family: "Oswald", sans-serif; - color: #ffffff; - text-align: left; - background-color: #152029; + margin-bottom: 15px; + border: none; + border-bottom: 2px solid #58636c; + width: 100%; + outline: none; + padding: 10px; + padding-left: 0; + font-family: "Oswald", sans-serif; + color: #ffffff; + text-align: left; + background-color: #152029; } ::placeholder { - /* Chrome, Firefox, Opera, Safari 10.1+ */ - color: rgba(84, 97, 105, 255); - font-family: "Oswald", sans-serif; - font-weight: 200; - opacity: 1; - /* Firefox */ + /* Chrome, Firefox, Opera, Safari 10.1+ */ + color: rgba(84, 97, 105, 255); + font-family: "Oswald", sans-serif; + font-weight: 200; + opacity: 1; + /* Firefox */ } .radio-toolbar input[type="radio"] { - opacity: 0; - position: absolute; - width: 36%; + opacity: 0; + position: absolute; + width: 36%; } .radio-toolbar label { - display: inline-block; - margin-top: 5px; - background-color: rgba(15, 15, 15, 0.9); - padding: 10px 20px; - font-family: "Oswald", sans-serif; - font-weight: 500; - font-size: 16px; - color: #ffffff; - border: none; - border-radius: 5px; - width: 36%; -} - -.radio-toolbar input[type="radio"]:checked+label { - width: 36%; - background-color: rgba(15, 15, 15, 0.9); - border: none; - border-bottom: 1px solid #93a3b6; - border-radius: 5px; - color: #ffffff; -} - -.radio-toolbar input[type="radio"]:focus+label { - background-color: rgba(15, 15, 15, 0.9); - border: none; - border-bottom: 1px solid #93a3b6; - border-radius: 5px; - color: #ffffff; + display: inline-block; + margin-top: 5px; + background-color: rgba(15, 15, 15, 0.9); + padding: 10px 20px; + font-family: "Oswald", sans-serif; + font-weight: 500; + font-size: 16px; + color: #ffffff; + border: none; + border-radius: 5px; + width: 36%; +} + +.radio-toolbar input[type="radio"]:checked + label { + width: 36%; + background-color: rgba(15, 15, 15, 0.9); + border: none; + border-bottom: 1px solid #93a3b6; + border-radius: 5px; + color: #ffffff; +} + +.radio-toolbar input[type="radio"]:focus + label { + background-color: rgba(15, 15, 15, 0.9); + border: none; + border-bottom: 1px solid #93a3b6; + border-radius: 5px; + color: #ffffff; } .radio-toolbar label:hover { - background-color: rgba(28, 24, 24, 0.931); - width: 36%; - color: #ffffff; + background-color: rgba(28, 24, 24, 0.931); + width: 36%; + color: #ffffff; } button { - display: block; - margin-top: 35px; - /*padding: 10px;*/ - background-color: #4569c6; - outline: none; - border: 2px double rgba(40, 40, 40, 0.9); - color: #ffffff; - height: 30px; - width: 100%; + display: block; + margin-top: 35px; + /*padding: 10px;*/ + background-color: #4569c6; + outline: none; + border: 2px double rgba(40, 40, 40, 0.9); + color: #ffffff; + height: 30px; + width: 100%; } h1 { - display: block; - margin-top: 5px; - margin-right: 5px; - padding: 10px; - background-color: rgba(15, 15, 15, 0.9); - color: #ffffff; - width: 93%; - text-align: center; + display: block; + margin-top: 5px; + margin-right: 5px; + padding: 10px; + background-color: rgba(15, 15, 15, 0.9); + color: #ffffff; + width: 93%; + text-align: center; } .range-wrap { - position: relative; - margin: 0 auto 3rem; + position: relative; + margin: 0 auto 3rem; } .range { - width: 100%; + width: 100%; } .bubble { - background: rgba(15, 15, 15, 0.9); - color: #ffffff; - padding: 4px 12px; - position: absolute; - border-radius: 4px; - left: 50%; - transform: translateX(-50%); + background: rgba(15, 15, 15, 0.9); + color: #ffffff; + padding: 4px 12px; + position: absolute; + border-radius: 4px; + left: 50%; + transform: translateX(-50%); } .bubble::after { - content: ""; - position: absolute; - width: 2px; - height: 2px; - background: rgba(15, 15, 15, 0.9); - color: black; - top: -1px; - left: 50%; -} \ No newline at end of file + content: ""; + position: absolute; + width: 2px; + height: 2px; + background: rgba(15, 15, 15, 0.9); + color: black; + top: -1px; + left: 50%; +} diff --git a/server-data/resources/[esx]/esx_identity/html/index.html b/server-data/resources/[esx]/esx_identity/html/index.html index 1d5a9ad31..f1320ea7b 100644 --- a/server-data/resources/[esx]/esx_identity/html/index.html +++ b/server-data/resources/[esx]/esx_identity/html/index.html @@ -1,77 +1,49 @@ + + + - - - + ESX Identity + - ESX Identity - + +

+
IDENTITY
+
+
First Name
+
+
Last Name
+
+
Date of Birth (MM/DD/YYYY)
+
+
Height
+
+
+
+ + - -
-
IDENTITY
- -
- First Name -
-
-
- Last Name -
-
-
- Date of Birth (MM/DD/YYYY) -
-
-
- Height -
-
-
-
- - - - - + + +
+
+ + +
+ If the submit button doesn't work, please ensure that you've entered the fields correctly. +
-
- - -
- If the submit button doesn't work, please ensure that you've entered - the fields correctly. -
-
- - - - - \ No newline at end of file + + + + diff --git a/server-data/resources/[esx]/esx_identity/html/js/script.js b/server-data/resources/[esx]/esx_identity/html/js/script.js index bca1d09bc..75cd203f7 100644 --- a/server-data/resources/[esx]/esx_identity/html/js/script.js +++ b/server-data/resources/[esx]/esx_identity/html/js/script.js @@ -1,46 +1,39 @@ window.addEventListener("message", (event) => { - if (event.data.type === "enableui") { - document.body.classList[event.data.enable ? "remove" : "add"]("none"); - } + if (event.data.type === "enableui") { + document.body.classList[event.data.enable ? "remove" : "add"]("none"); + } }); document.querySelector("#register").addEventListener("submit", (event) => { - event.preventDefault(); + event.preventDefault(); - const dofVal = document.querySelector("#dateofbirth").value; - if (!dofVal) return; + const dofVal = document.querySelector("#dateofbirth").value; + if (!dofVal) return; - const dateCheck = new Date(dofVal); + const dateCheck = new Date(dofVal); - const year = new Intl.DateTimeFormat("en", { year: "numeric" }).format( - dateCheck - ); - const month = new Intl.DateTimeFormat("en", { month: "2-digit" }).format( - dateCheck - ); - const day = new Intl.DateTimeFormat("en", { day: "2-digit" }).format( - dateCheck - ); + const year = new Intl.DateTimeFormat("en", { year: "numeric" }).format(dateCheck); + const month = new Intl.DateTimeFormat("en", { month: "2-digit" }).format(dateCheck); + const day = new Intl.DateTimeFormat("en", { day: "2-digit" }).format(dateCheck); - const formattedDate = `${day}/${month}/${year}`; - fetch("http://esx_identity/register", { - method: "POST", - body: JSON.stringify({ - firstname: document.querySelector("#firstname").value, - lastname: document.querySelector("#lastname").value, - dateofbirth: formattedDate, - sex: document.querySelector("input[type='radio'][name='sex']:checked") - .value, - height: document.querySelector("#height").value, - }), - }); + const formattedDate = `${day}/${month}/${year}`; + fetch("http://esx_identity/register", { + method: "POST", + body: JSON.stringify({ + firstname: document.querySelector("#firstname").value, + lastname: document.querySelector("#lastname").value, + dateofbirth: formattedDate, + sex: document.querySelector("input[type='radio'][name='sex']:checked").value, + height: document.querySelector("#height").value, + }), + }); - document.querySelector("#register").reset(); + document.querySelector("#register").reset(); }); document.addEventListener("DOMContentLoaded", () => { - fetch("http://esx_identity/ready", { - method: "POST", - body: JSON.stringify({}), - }); -}); \ No newline at end of file + fetch("http://esx_identity/ready", { + method: "POST", + body: JSON.stringify({}), + }); +}); diff --git a/server-data/resources/[esx]/esx_identity/locales/fr.lua b/server-data/resources/[esx]/esx_identity/locales/fr.lua index 08c93f415..8fe519cf4 100644 --- a/server-data/resources/[esx]/esx_identity/locales/fr.lua +++ b/server-data/resources/[esx]/esx_identity/locales/fr.lua @@ -2,37 +2,37 @@ Locales["fr"] = { ["show_active_character"] = "Afficher le personnage actif", ["active_character"] = "Personnage actif: %s", ["error_active_character"] = "Une erreur s'est produite lors de l'obtention de vos données.", - ["delete_character"] = "Supprimez votre personnage actuel.", - ["deleted_character"] = "Caractère supprimé", + ["delete_character"] = "Supprimer votre personnage actuel.", + ["deleted_character"] = "Personnage supprimé", ["error_delete_character"] = "Un problème est survenu lors de la suppression de votre personnage.", - ["thank_you_for_registering"] = "Inscription réussi. Profitez!", + ["thank_you_for_registering"] = "Inscription réussie. Bon jeu à vous!", ["debug_xPlayer_get_first_name"] = "Renvoie votre prénom", ["debug_xPlayer_get_last_name"] = "Renvoie votre nom de famille", ["debug_xPlayer_get_full_name"] = "Renvoie votre nom complet", - ["debug_xPlayer_get_sex"] = "Renvoie votre sexe", + ["debug_xPlayer_get_sex"] = "Renvoie votre genre", ["debug_xPlayer_get_dob"] = "Renvoie votre date de naissance", ["debug_xPlayer_get_height"] = "Renvoie votre taille", ["error_debug_xPlayer_get_first_name"] = "Un problème est survenu lors de l'obtention de votre prénom.", ["error_debug_xPlayer_get_last_name"] = "Un problème est survenu lors de l'obtention de votre nom de famille.", ["error_debug_xPlayer_get_full_name"] = "Un problème est survenu lors de l'obtention de votre nom complet.", - ["error_debug_xPlayer_get_sex"] = "Il y a eu un problème lors de l'obtention de votre sexe.", + ["error_debug_xPlayer_get_sex"] = "Un problème est survenu lors de l'obtention de votre genre.", ["error_debug_xPlayer_get_dob"] = "Un problème est survenu lors de l'obtention de votre date de naissance.", ["error_debug_xPlayer_get_height"] = "Un problème est survenu lors de l'obtention de votre taille.", ["return_debug_xPlayer_get_first_name"] = "Prénom: %s", ["return_debug_xPlayer_get_last_name"] = "Nom de famille: %s", ["return_debug_xPlayer_get_full_name"] = "Nom: %s", - ["return_debug_xPlayer_get_sex"] = "Sexe: %s", + ["return_debug_xPlayer_get_sex"] = "Genre: %s", ["return_debug_xPlayer_get_dob"] = "Date de naissance: %s", - ["return_debug_xPlayer_get_height"] = "Hauteur: %s pouces", - ["data_incorrect"] = "Données non valides, veuillez réessayer.", - ["invalid_format"] = "Format de données non valide, veuillez réessayer.", - ["no_identifier"] = "[ESX Identity]\nIl y a eu un problème lors du chargement de votre personnage !\nCode d'erreur : identifiant manquant\n\nCela est dû au fait que votre identifiant est manquant. Veuillez revenir plus tard ou signaler ce problème au propriétaire du serveur.", - ["missing_identity"] = "[ESX Identity]Un problème est survenu lors du chargement de votre personnage !Code d'erreur : identité manquante\n\nIl semble que votre identité soit manquante, essayez de vous reconnecter.", + ["return_debug_xPlayer_get_height"] = "Taille: %s pouces", + ["data_incorrect"] = "Données invalides, veuillez réessayer.", + ["invalid_format"] = "Format de données invalide, veuillez réessayer.", + ["no_identifier"] = "[ESX Identity]\nUn problème est survenu lors du chargement de votre personnage !\nCode d'erreur : identifier-missing\n\nIl semble que votre identifiant soit manquant. Veuillez revenir plus tard ou signaler ce problème au propriétaire du serveur.", + ["missing_identity"] = "[ESX Identity]Un problème est survenu lors du chargement de votre personnage !\nCode d'erreur : identity-missing\n\nIl semble que votre identité soit manquante, essayez de vous reconnecter.", ["deleted_identity"] = "Personnage supprimé. Veuillez vous réinscrire pour créer un nouveau personnage.", - ["already_registered"] = "Vous êtes déjà inscrit.", - ["invalid_firstname_format"] = "Format non valide (prénom) : veuillez réessayer.", - ["invalid_lastname_format"] = "Format non valide (nom de famille) : veuillez réessayer.", - ["invalid_dob_format"] = "Format non valide (DDN) : veuillez réessayer.", - ["invalid_sex_format"] = "Format non valide (sexe) : veuillez réessayer.", - ["invalid_height_format"] = "Format non valide (hauteur) : veuillez réessayer.", + ["already_registered"] = "Vous êtes déjà enregistré.", + ["invalid_firstname_format"] = "Format invalide (Prénom) : Veuillez réessayer.", + ["invalid_lastname_format"] = "Format invalide (Nom de famille) : Veuillez réessayer.", + ["invalid_dob_format"] = "Format invalide (Date de naissance) : Veuillez réessayer.", + ["invalid_sex_format"] = "Format invalide (Genre) : Veuillez réessayer.", + ["invalid_height_format"] = "Format invalide (Taille) : Veuillez réessayer.", } diff --git a/server-data/resources/[esx]/esx_identity/locales/he.lua b/server-data/resources/[esx]/esx_identity/locales/he.lua new file mode 100644 index 000000000..623481882 --- /dev/null +++ b/server-data/resources/[esx]/esx_identity/locales/he.lua @@ -0,0 +1,38 @@ +Locales["he"] = { + ['show_active_character'] = 'הצג דמות פעילה', + ['active_character'] = 'דמות פעילה: %s', + ['error_active_character'] = 'אירעה שגיאה בקבלת הנתונים שלך.', + ['delete_character'] = 'מחק את הדמות הנוכחית שלך.', + ['deleted_character'] = 'הדמות נמחקה', + ['error_delete_character'] = 'אירעה בעיה במחיקת הדמות שלך.', + ['thank_you_for_registering'] = 'הרשמה הושלמה. תהנה!', + ['debug_xPlayer_get_first_name'] = 'מחזיר את שמך הפרטי', + ['debug_xPlayer_get_last_name'] = 'מחזיר את שם משפחתך', + ['debug_xPlayer_get_full_name'] = 'מחזיר את שמך המלא', + ['debug_xPlayer_get_sex'] = 'מחזיר את המין שלך', + ['debug_xPlayer_get_dob'] = 'מחזיר את תאריך הלידה שלך', + ['debug_xPlayer_get_height'] = 'מחזיר את גובהך', + ['error_debug_xPlayer_get_first_name'] = 'הייתה בעיה בקבלת שמך הפרטי.', + ['error_debug_xPlayer_get_last_name'] = 'הייתה בעיה בקבלת שם משפחתך.', + ['error_debug_xPlayer_get_full_name'] = 'הייתה בעיה בקבלת שמך המלא.', + ['error_debug_xPlayer_get_sex'] = 'הייתה בעיה בקבלת המין שלך.', + ['error_debug_xPlayer_get_dob'] = 'הייתה בעיה בקבלת תאריך הלידה שלך.', + ['error_debug_xPlayer_get_height'] = 'הייתה בעיה בקבלת הגובה שלך.', + ['return_debug_xPlayer_get_first_name'] = 'שם פרטי: %s', + ['return_debug_xPlayer_get_last_name'] = 'שם משפחה: %s', + ['return_debug_xPlayer_get_full_name'] = 'שם: %s', + ['return_debug_xPlayer_get_sex'] = 'מין: %s', + ['return_debug_xPlayer_get_dob'] = 'תאריך לידה: %s', + ['return_debug_xPlayer_get_height'] = 'גובה: %s אינץ', + ['data_incorrect'] = 'נתונים לא תקניים, נסה שוב.', + ['invalid_format'] = 'פורמט נתונים לא תקני, נסה שוב.', + ['no_identifier'] = '[ESX Identity]\nהייתה בעיה בטעינת הדמות שלך!\nקוד שגיאה: מזהה חסר\n\nזה נגרם על ידי חוסר המזהה שלך. אנא חזור מאוחר יותר או דווח על הבעיה לבעל השרת.', + ['missing_identity'] = '[ESX Identity]\nהייתה בעיה בטעינת הדמות שלך!\nקוד שגיאה: זהות חסרה\n\nנראה שהזהות שלך חסרה, נסה להתחבר שוב.', + ['deleted_identity'] = 'הדמות נמחקה. אנא הצטרף מחדש כדי ליצור דמות חדשה.', + ['already_registered'] = 'כבר נרשמת.', + ['invalid_firstname_format'] = 'פורמט לא תקני (שם פרטי): נסה שוב.', + ['invalid_lastname_format'] = 'פורמט לא תקני (שם משפחה): נסה שוב.', + ['invalid_dob_format'] = 'פורמט לא תקני (תאריך לידה): נסה שוב.', + ['invalid_sex_format'] = 'פורמט לא תקני (מין): נסה שוב.', + ['invalid_height_format'] = 'פורמט לא תקני (גובה): נסה שוב.', +} diff --git a/server-data/resources/[esx]/esx_identity/locales/sl.lua b/server-data/resources/[esx]/esx_identity/locales/sl.lua index 4096ba4a7..2e9615782 100644 --- a/server-data/resources/[esx]/esx_identity/locales/sl.lua +++ b/server-data/resources/[esx]/esx_identity/locales/sl.lua @@ -1,38 +1,38 @@ -Locales["sl"] = { - ["show_active_character"] = "Prikazi aktivni Karakter", - ["active_character"] = "Aktivni Karakter: %s", - ["error_active_character"] = "Pri pridobivanju vasih podatkov je prislo do napake.", - ["delete_character"] = "Izbrisi vas trenutni Karakter.", - ["deleted_character"] = "Karakter izbrisan", - ["error_delete_character"] = "Pri brisanju vasega lika je prislo do tezave.", - ["thank_you_for_registering"] = "Registracija uspesna. Uzivajte!", - ["debug_xPlayer_get_first_name"] = "Vrne vase ime", - ["debug_xPlayer_get_last_name"] = "Vrne vas priimek", - ["debug_xPlayer_get_full_name"] = "Vrne vase polno ime", - ["debug_xPlayer_get_sex"] = "Vrne vas spol", - ["debug_xPlayer_get_dob"] = "Vrne vas DOB", - ["debug_xPlayer_get_height"] = "Vrne vaso visino", - ["error_debug_xPlayer_get_first_name"] = "Pri pridobivanju vasega imena je prislo do tezave.", - ["error_debug_xPlayer_get_last_name"] = "Pri pridobivanju vasega priimka je prislo do tezave.", - ["error_debug_xPlayer_get_full_name"] = "Pri pridobivanju vasega polnega imena je prislo do tezave.", - ["error_debug_xPlayer_get_sex"] = "Pri pridobivanju vasega spola je prislo do tezave.", - ["error_debug_xPlayer_get_dob"] = "Pri pridobivanju vasega datuma rojstva je prislo do tezave.", - ["error_debug_xPlayer_get_height"] = "Pri pridobivanju vase visine je prislo do tezave.", - ["return_debug_xPlayer_get_first_name"] = "Ime: %s", - ["return_debug_xPlayer_get_last_name"] = "Priimek: %s", - ["return_debug_xPlayer_get_full_name"] = "Ime: %s", - ["return_debug_xPlayer_get_sex"] = "Spol: %s", - ["return_debug_xPlayer_get_dob"] = "DOB: %s", - ["return_debug_xPlayer_get_height"] = "Visina: %s palcev", - ["data_incorrect"] = "Neveljavni podatki, poskusite znova.", - ["invalid_format"] = "Neveljavna oblika podatkov, poskusite znova.", - ["no_identifier"] = "[ESX Identiteta]\nPri nalaganju vasega lika je prislo do tezave!\nKoda napake: identifikator-manjka\n\nTo je posledica tega, da manjka vas identifikator. Vrnite se pozneje ali prijavite to tezavo lastniku streznika.", - ["missing_identity"] = "[ESX Identity]\nPri nalaganju vasega lika je prislo do tezave!\nKoda napake: identity-missing\n\nVideti je, da vasa identiteta manjka, poskusite znova vzpostaviti povezavo.", - ["deleted_identity"] = "Karakter izbrisan. Ponovno se pridruzite, da ustvarite nov lik.", - ["already_registered"] = "Registrirali ste se ze.", - ["invalid_firstname_format"] = "Neveljavna oblika (ime): Prosimo, poskusite znova.", - ["invalid_lastname_format"] = "Neveljavna oblika (priimek): Poskusite ponovno.", - ["invalid_dob_format"] = "Neveljavna oblika (DOB): Prosimo, poskusite znova.", - ["invalid_sex_format"] = "Neveljavna oblika (spol): Poskusite ponovno.", - ["invalid_height_format"] = "Neveljavna oblika (visina): Prosimo, poskusite znova.", -} +Locales['sl'] = { + ['show_active_character'] = 'Prikaži aktivnega lika', + ['active_character'] = 'Aktivni lik: %s', + ['error_active_character'] = 'Prišlo je do napake pri pridobivanju podatkov.', + ['delete_character'] = 'Izbriši trenutnega lika.', + ['deleted_character'] = 'Lik je bil izbrisan', + ['error_delete_character'] = 'Prišlo je do težave pri brisanju lika.', + ['thank_you_for_registering'] = 'Registracija uspešna. Uživajte!', + ['debug_xPlayer_get_first_name'] = 'Vrne vaše ime', + ['debug_xPlayer_get_last_name'] = 'Vrne vaše priimek', + ['debug_xPlayer_get_full_name'] = 'Vrne vaše polno ime', + ['debug_xPlayer_get_sex'] = 'Vrne vaš spol', + ['debug_xPlayer_get_dob'] = 'Vrne vaš datum rojstva', + ['debug_xPlayer_get_height'] = 'Vrne vašo višino', + ['error_debug_xPlayer_get_first_name'] = 'Prišlo je do težave pri pridobivanju vašega imena.', + ['error_debug_xPlayer_get_last_name'] = 'Prišlo je do težave pri pridobivanju vašega priimka.', + ['error_debug_xPlayer_get_full_name'] = 'Prišlo je do težave pri pridobivanju vašega polnega imena.', + ['error_debug_xPlayer_get_sex'] = 'Prišlo je do težave pri pridobivanju vašega spola.', + ['error_debug_xPlayer_get_dob'] = 'Prišlo je do težave pri pridobivanju vašega datuma rojstva.', + ['error_debug_xPlayer_get_height'] = 'Prišlo je do težave pri pridobivanju vaše višine.', + ['return_debug_xPlayer_get_first_name'] = 'Ime: %s', + ['return_debug_xPlayer_get_last_name'] = 'Priimek: %s', + ['return_debug_xPlayer_get_full_name'] = 'Ime: %s', + ['return_debug_xPlayer_get_sex'] = 'Spol: %s', + ['return_debug_xPlayer_get_dob'] = 'Datum rojstva: %s', + ['return_debug_xPlayer_get_height'] = 'Višina: %s palcev', + ['data_incorrect'] = 'Neveljavni podatki. Poskusite znova.', + ['invalid_format'] = 'Neveljavna oblika podatkov. Poskusite znova.', + ['no_identifier'] = '[ESX Identity]\nPrišlo je do težave pri nalaganju vašega lika!\nNapaka: manjkajoč-identifier\n\nTo je posledica manjkajočega identifikatorja. Prosimo, poskusite znova kasneje ali to težavo prijavite lastniku strežnika.', + ['missing_identity'] = '[ESX Identity]\nPrišlo je do težave pri nalaganju vašega lika!\nNapaka: manjkajoč-identity\n\nZdi se, da manjka vaša identiteta. Poskusite znova.', + ['deleted_identity'] = 'Lik izbrisan. Prosimo, ponovno se pridružite in ustvarite nov lik.', + ['already_registered'] = 'Že ste registrirani.', + ['invalid_firstname_format'] = 'Neveljavna oblika (Ime). Poskusite znova.', + ['invalid_lastname_format'] = 'Neveljavna oblika (Priimek). Poskusite znova.', + ['invalid_dob_format'] = 'Neveljavna oblika (Datum rojstva). Poskusite znova.', + ['invalid_sex_format'] = 'Neveljavna oblika (Spol). Poskusite znova.', + ['invalid_height_format'] = 'Neveljavna oblika (Višina). Poskusite znova.' + } \ No newline at end of file diff --git a/server-data/resources/[esx]/esx_identity/locales/sv.lua b/server-data/resources/[esx]/esx_identity/locales/sv.lua new file mode 100644 index 000000000..884a6c44b --- /dev/null +++ b/server-data/resources/[esx]/esx_identity/locales/sv.lua @@ -0,0 +1,38 @@ +Locales["sv"] = { + ["show_active_character"] = "Visa aktiv karaktär", + ["active_character"] = "Aktiv karaktär: %s", + ["error_active_character"] = "Det blev ett fel med att ta din data.", + ["delete_character"] = "Radera din nuvarande karaktär.", + ["deleted_character"] = "Karaktär raderad", + ["error_delete_character"] = "Det uppstod ett problem med att radera din karaktär.", + ["thank_you_for_registering"] = "Din karaktär är skapad. Grattis!", + ["debug_xPlayer_get_first_name"] = "Ger ditt förnamn", + ["debug_xPlayer_get_last_name"] = "Ger ditt efternamn", + ["debug_xPlayer_get_full_name"] = "Ger ditt fulla namn", + ["debug_xPlayer_get_sex"] = "Ger ditt kön", + ["debug_xPlayer_get_dob"] = "Ger ditt födelsedatum", + ["debug_xPlayer_get_height"] = "Ger din längd", + ["error_debug_xPlayer_get_first_name"] = "Det blev ett problem med att få ditt förnamn.", + ["error_debug_xPlayer_get_last_name"] = "Det blev ett problem med att få ditt efternamn.", + ["error_debug_xPlayer_get_full_name"] = "Det blev ett problem med att få ditt fulla namn.", + ["error_debug_xPlayer_get_sex"] = "Det blev ett problem med att få ditt kön.", + ["error_debug_xPlayer_get_dob"] = "Det blev ett problem med att få ditt födelsedatum.", + ["error_debug_xPlayer_get_height"] = "Det blev ett problem med att få din längd.", + ["return_debug_xPlayer_get_first_name"] = "Förnamn: %s", + ["return_debug_xPlayer_get_last_name"] = "Efternamn: %s", + ["return_debug_xPlayer_get_full_name"] = "Namn: %s", + ["return_debug_xPlayer_get_sex"] = "Kön: %s", + ["return_debug_xPlayer_get_dob"] = "Födelsedatum: %s", + ["return_debug_xPlayer_get_height"] = "Längd: %s Cm", + ["data_incorrect"] = "Ogiltigt, försök igen.", + ["invalid_format"] = "Ogiltigt format, försök igen.", + ["no_identifier"] = "[ESX Identity]\nDet blev ett fel med att ladda din karaktär!\nFelkod: identifier-missing\n\nSer ut som att din identifier saknas. Testa senare eller kontakta serverägare.", + ["missing_identity"] = "[ESX Identity]\nThere was an issue loading your character!\nFelkod: identity-missing\n\nSer ut som att din identity saknas, testa anslut igen.", + ["deleted_identity"] = "Karaktär raderad. Restarta ditt spel för att skapa ny karaktär.", + ["already_registered"] = "Du har redan registrerat.", + ["invalid_firstname_format"] = "Ogiltigt format (Förnamn): Försök igen.", + ["invalid_lastname_format"] = "Ogiltigt format (Efternamn): Försök igen.", + ["invalid_dob_format"] = "Ogiltigt format (Födelsedatum): Försök igen.", + ["invalid_sex_format"] = "Ogiltigt format (Kön): Försök igen.", + ["invalid_height_format"] = "Ogiltigt format (Längd): Försök igen.", + } diff --git a/server-data/resources/[esx]/esx_identity/preview.png b/server-data/resources/[esx]/esx_identity/preview.png new file mode 100644 index 000000000..39dd41fa9 Binary files /dev/null and b/server-data/resources/[esx]/esx_identity/preview.png differ diff --git a/server-data/resources/[esx]/esx_society/esx_society.sql b/server-data/resources/[esx]/esx_society/esx_society.sql index c65e742a5..e53b76f41 100644 --- a/server-data/resources/[esx]/esx_society/esx_society.sql +++ b/server-data/resources/[esx]/esx_society/esx_society.sql @@ -1,5 +1,3 @@ - - CREATE TABLE `society_moneywash` ( `id` int NOT NULL AUTO_INCREMENT, `identifier` varchar(60) NOT NULL, diff --git a/server-data/resources/[esx_addons]/BasicItem/sql.sql b/server-data/resources/[esx_addons]/BasicItem/sql.sql index 80eb848b9..da258ad3e 100644 --- a/server-data/resources/[esx_addons]/BasicItem/sql.sql +++ b/server-data/resources/[esx_addons]/BasicItem/sql.sql @@ -1,4 +1,3 @@ - INSERT INTO `items` (`name`, `label`) VALUES ('idcard', 'Carte d Identité'), ('jobcard', 'Carte Entreprise'), diff --git a/server-data/resources/[esx_addons]/esx_addonaccount/esx_addonaccount.sql b/server-data/resources/[esx_addons]/esx_addonaccount/esx_addonaccount.sql index 8f766473b..47478d248 100644 --- a/server-data/resources/[esx_addons]/esx_addonaccount/esx_addonaccount.sql +++ b/server-data/resources/[esx_addons]/esx_addonaccount/esx_addonaccount.sql @@ -1,5 +1,3 @@ - - CREATE TABLE `addon_account` ( `name` VARCHAR(60) NOT NULL, `label` VARCHAR(100) NOT NULL, diff --git a/server-data/resources/[esx_addons]/esx_addoninventory/.editorconfig b/server-data/resources/[esx_addons]/esx_addoninventory/.editorconfig deleted file mode 100644 index 9b425256f..000000000 --- a/server-data/resources/[esx_addons]/esx_addoninventory/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -indent_size = 4 -indent_style = tab -end_of_line = crlf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_addoninventory/esx_addoninventory.sql b/server-data/resources/[esx_addons]/esx_addoninventory/esx_addoninventory.sql index ed1022409..44b013412 100644 --- a/server-data/resources/[esx_addons]/esx_addoninventory/esx_addoninventory.sql +++ b/server-data/resources/[esx_addons]/esx_addoninventory/esx_addoninventory.sql @@ -1,5 +1,3 @@ - - CREATE TABLE `addon_inventory` ( `name` VARCHAR(60) NOT NULL, `label` VARCHAR(100) NOT NULL, diff --git a/server-data/resources/[esx_addons]/esx_boat/esx_boat.sql b/server-data/resources/[esx_addons]/esx_boat/esx_boat.sql index 784e656b2..0e8f83d08 100644 --- a/server-data/resources/[esx_addons]/esx_boat/esx_boat.sql +++ b/server-data/resources/[esx_addons]/esx_boat/esx_boat.sql @@ -1,5 +1,3 @@ - - INSERT INTO `licenses` (`type`, `label`) VALUES ('boat', 'Boat License') ; \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_datastore/esx_datastore.sql b/server-data/resources/[esx_addons]/esx_datastore/esx_datastore.sql index d63824132..589519d0e 100644 --- a/server-data/resources/[esx_addons]/esx_datastore/esx_datastore.sql +++ b/server-data/resources/[esx_addons]/esx_datastore/esx_datastore.sql @@ -1,5 +1,3 @@ - - CREATE TABLE `datastore` ( `name` VARCHAR(60) NOT NULL, `label` VARCHAR(100) NOT NULL, diff --git a/server-data/resources/[esx_addons]/esx_taxijob/esx_taxijob.sql b/server-data/resources/[esx_addons]/esx_taxijob/esx_taxijob.sql index 0774bc9d4..927bbf32b 100644 --- a/server-data/resources/[esx_addons]/esx_taxijob/esx_taxijob.sql +++ b/server-data/resources/[esx_addons]/esx_taxijob/esx_taxijob.sql @@ -1,5 +1,3 @@ - - INSERT INTO `addon_account` (name, label, shared) VALUES ('society_taxi', 'Taxi', 1) ; diff --git a/server-data/resources/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql b/server-data/resources/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql index e18a2d3b7..c88009e42 100644 --- a/server-data/resources/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql +++ b/server-data/resources/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql @@ -1,5 +1,3 @@ - - INSERT INTO `addon_account` (name, label, shared) VALUES ('society_cardealer','Concessionnaire',1) ; diff --git a/server-data/resources/[ox]/ox_inventory/data/items.lua b/server-data/resources/[ox]/ox_inventory/data/items.lua index 23776de66..028ce3311 100644 --- a/server-data/resources/[ox]/ox_inventory/data/items.lua +++ b/server-data/resources/[ox]/ox_inventory/data/items.lua @@ -458,7 +458,7 @@ return { ['boar_meat'] = { label = 'carne di cinghiale', - weight = 3000, + weight = 500, stack = true, }, @@ -470,7 +470,7 @@ return { ['deer_meat'] = { label = 'carne di cervo', - weight = 3000, + weight = 500, stack = true, }, @@ -488,7 +488,7 @@ return { ['gunpowder'] = { label = 'polvere da sparo', - weight = 500, + weight = 100, stack = true, }, @@ -570,4 +570,11 @@ return { stack = true, consume = 1, }, + + ["medikit"] = { + label = "Medikit", + weight = 2, + stack = true, + close = true, + }, } \ No newline at end of file