Merge pull request #735 from bitpredator/dev

varius fix
bitpredator · Jun 21, 2024 · 83c9821 · 83c9821
2 parents 9ed0d3e + b47e68b
commit 83c9821
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/server-data/resources/[bpt_addons]/bpt_billing/locales/it.lua b/server-data/resources/[bpt_addons]/bpt_billing/locales/it.lua
@@ -9,4 +9,5 @@ Locales["it"] = {
     ["no_money"] = "non hai abbastanza soldi per pagare questa fattura",
     ["target_no_money"] = "il giocatore ~r~non ha~s~ abbastanza soldi per pagare la fattura!",
     ["keymap_showbills"] = "apri il menu delle fatture",
+    ["billing"] = "fattura",
 }
diff --git a/server-data/resources/[bpt_addons]/bpt_dmvschool/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_dmvschool/fxmanifest.lua
@@ -4,7 +4,7 @@ game("gta5")
 
 description("A DMV School for players to get their drivers license")
 
-version("1.0.0")
+version("1.0.1")
 
 lua54("yes")
 
@@ -24,13 +24,13 @@ client_scripts({
     "client/main.lua",
 })
 
-ui_page("html/ui.html")
+ui_page("html/ui_it.html")
 
 files({
-    "html/ui.html",
+    "html/ui_it.html",
     "html/dmv.png",
     "html/styles.css",
-    "html/questions.js",
+    "html/questions_it.js",
     "html/scripts.js",
     "html/debounce.min.js",
 })

diff --git a/server-data/resources/[bpt_addons]/bpt_dmvschool/html/questions_it.js b/server-data/resources/[bpt_addons]/bpt_dmvschool/html/questions_it.js
@@ -3,13 +3,13 @@ var tableauQuestion = [
 		question: "Se stai andando a 80 km/h, e ti stai avvicinando a una zona residenziale devi::",
 		propositionA: "Accellerare",
 		propositionB: "Mantieni la velocità, se non sorpassi altri veicoli",
-		propositionC: "Ralenti",
+		propositionC: "Rallenti",
 		propositionD: "Mantieni la velocità",
 		reponse: "C"
 	},
 
 	{
-		question: "Se al semaforo stai svoltaando a destra, ma vedi un pedone cosa fai:",
+		question: "Se al semaforo stai svoltando a destra, ma vedi un pedone cosa fai:",
 		propositionA: "Superi il pedone",
 		propositionB: "Controlli che non ci siano altri veicoli in giro",
 		propositionC: "Aspetti che il pedone abbia attraversato",

diff --git a/server-data/resources/[bpt_addons]/bpt_dmvschool/html/ui_it.html b/server-data/resources/[bpt_addons]/bpt_dmvschool/html/ui_it.html
@@ -114,7 +114,7 @@ <h2>Progressi</h2>
     </div>
 
     <script src="nui://game/ui/jquery.js" type="text/javascript"></script>
-    <script src="questions.js" type="text/javascript"></script>
+    <script src="questions_it.js" type="text/javascript"></script>
     <script src="scripts.js" type="text/javascript"></script>
     <script src="debounce.min.js" type="text/javascript"></script>
 

diff --git a/server-data/resources/[esx]/es_extended/locales/it.lua b/server-data/resources/[esx]/es_extended/locales/it.lua
@@ -44,7 +44,7 @@ Locales["it"] = {
     ["received_salary"] = "Sei stato pagato: $%s",
     ["received_help"] = "Hai ricevuto il reddito di cittadinanza: $%s",
     ["company_nomoney"] = "La tua compagnia è troppo povera per pagarti",
-    ["received_paycheck"] = "Ricveuto stipendio",
+    ["received_paycheck"] = "Hai ricevuto lo stipendio",
     ["bank"] = "Banca",
     ["account_bank"] = "Conto",
     ["account_black_money"] = "Soldi sporchi",

diff --git a/server-data/resources/[esx]/es_extended/server/main.lua b/server-data/resources/[esx]/es_extended/server/main.lua
@@ -239,7 +239,7 @@ function loadESXPlayer(identifier, playerId, isNew)
     end
 
     -- Position
-    userData.coords = json.decode(result.position) or Config.DefaultSpawns[ESX.Math.Random(1,#Config.DefaultSpawns)]
+    userData.coords = json.decode(result.position) or Config.DefaultSpawns[math.random(#Config.DefaultSpawns)]
 
     -- Skin
     userData.skin = (result.skin and result.skin ~= "") and json.decode(result.skin) or { sex = userData.sex == "f" and 1 or 0 }

diff --git a/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua b/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua
@@ -385,7 +385,7 @@ function OpenResellerMenu()
 							ESX.ShowNotification(TranslateCap("no_players"))
 						else
 							TriggerServerEvent(
-								"esx_billing:sendBill",
+								"bpt_billing:sendBill",
 								GetPlayerServerId(closestPlayer),
 								"society_cardealer",
 								TranslateCap("car_dealer"),

diff --git a/server-data/resources/[ox]/ox_inventory/data/items.lua b/server-data/resources/[ox]/ox_inventory/data/items.lua
@@ -18,7 +18,7 @@ return {
 		label = "Burger",
 		weight = 220,
 		client = {
-			status = { hunger = 2000 },
+			status = { hunger = 25000 },
 			anim = "eating",
 			prop = "burger",
 			usetime = 2500,