From cb635c8e0f37514c7f97f9b388f37678f35292fa Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:13:37 +0100 Subject: [PATCH] chore: (bpt_bakerjob) replace _U with TranslateCap --- .../[bpt_addons]/bpt_bakerjob/client/main.lua | 62 +++++++++---------- .../[bpt_addons]/bpt_bakerjob/server/main.lua | 10 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/server-data/resources/[bpt_addons]/bpt_bakerjob/client/main.lua b/server-data/resources/[bpt_addons]/bpt_bakerjob/client/main.lua index 3e4bc2a26..76d2dc013 100644 --- a/server-data/resources/[bpt_addons]/bpt_bakerjob/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_bakerjob/client/main.lua @@ -41,9 +41,9 @@ end function OpenCloakroom() local elements = { - { unselectable = true, icon = "fas fa-shirt", title = _U("cloakroom_menu") }, - { icon = "fas fa-shirt", title = _U("wear_citizen"), value = "wear_citizen" }, - { icon = "fas fa-shirt", title = _U("wear_work"), value = "wear_work" }, + { unselectable = true, icon = "fas fa-shirt", title = TranslateCap("cloakroom_menu") }, + { icon = "fas fa-shirt", title = TranslateCap("wear_citizen"), value = "wear_citizen" }, + { icon = "fas fa-shirt", title = TranslateCap("wear_work"), value = "wear_work" }, } ESX.OpenContext("right", elements, function(_, element) @@ -63,20 +63,20 @@ function OpenCloakroom() ESX.CloseContext() end, function() CurrentAction = "cloakroom" - CurrentActionMsg = _U("cloakroom_prompt") + CurrentActionMsg = TranslateCap("cloakroom_prompt") CurrentActionData = {} end) end function OpenVehicleSpawnerMenu() local elements = { - { unselectable = true, icon = "fas fa-car", title = _U("spawn_veh") }, + { unselectable = true, icon = "fas fa-car", title = TranslateCap("spawn_veh") }, } if Config.EnableSocietyOwnedVehicles then ESX.TriggerServerCallback("esx_society:getVehiclesInGarage", function(vehicles) if #vehicles == 0 then - ESX.ShowNotification(_U("empty_garage")) + ESX.ShowNotification(TranslateCap("empty_garage")) return end @@ -90,7 +90,7 @@ function OpenVehicleSpawnerMenu() ESX.OpenContext("right", elements, function(_, element) if not ESX.Game.IsSpawnPointClear(Config.Zones.VehicleSpawnPoint.Pos, 5.0) then - ESX.ShowNotification(_U("spawnpoint_blocked")) + ESX.ShowNotification(TranslateCap("spawnpoint_blocked")) return end @@ -106,13 +106,13 @@ function OpenVehicleSpawnerMenu() TriggerServerEvent("esx_society:removeVehicleFromGarage", "baker", vehicleProps) end, function() CurrentAction = "vehicle_spawner" - CurrentActionMsg = _U("spawner_prompt") + CurrentActionMsg = TranslateCap("spawner_prompt") CurrentActionData = {} end) end, "baker") else -- not society vehicles if #Config.AuthorizedVehicles == 0 then - ESX.ShowNotification(_U("empty_garage")) + ESX.ShowNotification(TranslateCap("empty_garage")) return end @@ -126,7 +126,7 @@ function OpenVehicleSpawnerMenu() ESX.OpenContext("right", elements, function(_, element) if not ESX.Game.IsSpawnPointClear(Config.Zones.VehicleSpawnPoint.Pos, 5.0) then - ESX.ShowNotification(_U("spawnpoint_blocked")) + ESX.ShowNotification(TranslateCap("spawnpoint_blocked")) return end @@ -136,12 +136,12 @@ function OpenVehicleSpawnerMenu() end ESX.TriggerServerCallback("bpt_bakerjob:SpawnVehicle", function() - ESX.ShowNotification(_U("vehicle_spawned"), "success") + ESX.ShowNotification(TranslateCap("vehicle_spawned"), "success") end, element.value, { plate = "BAKE JOB" }) ESX.CloseContext() end, function() CurrentAction = "vehicle_spawner" - CurrentActionMsg = _U("spawner_prompt") + CurrentActionMsg = TranslateCap("spawner_prompt") CurrentActionData = {} end) end @@ -156,22 +156,22 @@ function DeleteJobVehicle() if IsInAuthorizedVehicle() then ESX.Game.DeleteVehicle(CurrentActionData.vehicle) else - ESX.ShowNotification(_U("only_baker")) + ESX.ShowNotification(TranslateCap("only_baker")) end end end function OpenbakerActionsMenu() local elements = { - { unselectable = true, icon = "fas fa-baker", title = _U("baker") }, - { icon = "fas fa-box", title = _U("deposit_stock"), value = "put_stock" }, - { icon = "fas fa-box", title = _U("take_stock"), value = "get_stock" }, + { unselectable = true, icon = "fas fa-baker", title = TranslateCap("baker") }, + { icon = "fas fa-box", title = TranslateCap("deposit_stock"), value = "put_stock" }, + { icon = "fas fa-box", title = TranslateCap("take_stock"), value = "get_stock" }, } if Config.EnablePlayerManagement and ESX.PlayerData.job ~= nil and ESX.PlayerData.job.grade_name == "boss" then elements[#elements + 1] = { icon = "fas fa-wallet", - title = _U("boss_actions"), + title = TranslateCap("boss_actions"), value = "boss_actions", } end @@ -191,15 +191,15 @@ function OpenbakerActionsMenu() end end, function() CurrentAction = "baker_actions_menu" - CurrentActionMsg = _U("press_to_open") + CurrentActionMsg = TranslateCap("press_to_open") CurrentActionData = {} end) end function OpenMobileBakerActionsMenu() local elements = { - { unselectable = true, icon = "fas fa-baker", title = _U("baker") }, - { icon = "fas fa-scroll", title = _U("billing"), value = "billing" }, + { unselectable = true, icon = "fas fa-baker", title = TranslateCap("baker") }, + { icon = "fas fa-scroll", title = TranslateCap("billing"), value = "billing" }, } ESX.OpenContext("right", elements, function(_, element) @@ -207,25 +207,25 @@ function OpenMobileBakerActionsMenu() local elements2 = { { unselectable = true, icon = "fas fa-baker", title = element.title }, { - title = _U("amount"), + title = TranslateCap("amount"), input = true, inputType = "number", inputMin = 1, inputMax = 250000, - inputPlaceholder = _U("bill_amount"), + inputPlaceholder = TranslateCap("bill_amount"), }, - { icon = "fas fa-check-double", title = _U("confirm"), value = "confirm" }, + { icon = "fas fa-check-double", title = TranslateCap("confirm"), value = "confirm" }, } ESX.OpenContext("right", elements2, function(menu2) local amount = tonumber(menu2.eles[2].inputValue) if amount == nil then - ESX.ShowNotification(_U("amount_invalid")) + ESX.ShowNotification(TranslateCap("amount_invalid")) else ESX.CloseContext() local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() if closestPlayer == -1 or closestDistance > 3.0 then - ESX.ShowNotification(_U("no_players_near")) + ESX.ShowNotification(TranslateCap("no_players_near")) else TriggerServerEvent( "esx_billing:sendBill", @@ -234,7 +234,7 @@ function OpenMobileBakerActionsMenu() "Baker", amount ) - ESX.ShowNotification(_U("billing_sent")) + ESX.ShowNotification(TranslateCap("billing_sent")) end end end) @@ -258,7 +258,7 @@ end AddEventHandler("bpt_bakerjob:hasEnteredMarker", function(zone) if zone == "VehicleSpawner" then CurrentAction = "vehicle_spawner" - CurrentActionMsg = _U("spawner_prompt") + CurrentActionMsg = TranslateCap("spawner_prompt") CurrentActionData = {} elseif zone == "VehicleDeleter" then local playerPed = PlayerPedId() @@ -266,18 +266,18 @@ AddEventHandler("bpt_bakerjob:hasEnteredMarker", function(zone) if IsPedInAnyVehicle(playerPed, false) and GetPedInVehicleSeat(vehicle, -1) == playerPed then CurrentAction = "delete_vehicle" - CurrentActionMsg = _U("store_veh") + CurrentActionMsg = TranslateCap("store_veh") CurrentActionData = { vehicle = vehicle, } end elseif zone == "BakerActions" then CurrentAction = "baker_actions_menu" - CurrentActionMsg = _U("press_to_open") + CurrentActionMsg = TranslateCap("press_to_open") CurrentActionData = {} elseif zone == "Cloakroom" then CurrentAction = "cloakroom" - CurrentActionMsg = _U("cloakroom_prompt") + CurrentActionMsg = TranslateCap("cloakroom_prompt") CurrentActionData = {} end end) @@ -302,7 +302,7 @@ CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentSubstringPlayerName(_U("blip_baker")) + AddTextComponentSubstringPlayerName(TranslateCap("blip_baker")) EndTextCommandSetBlipName(blip) end) diff --git a/server-data/resources/[bpt_addons]/bpt_bakerjob/server/main.lua b/server-data/resources/[bpt_addons]/bpt_bakerjob/server/main.lua index ca2c119a4..982787cf3 100644 --- a/server-data/resources/[bpt_addons]/bpt_bakerjob/server/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_bakerjob/server/main.lua @@ -42,12 +42,12 @@ AddEventHandler("bpt_bakerjob:getStockItem", function(itemName, count) if xPlayer.canCarryItem(itemName, count) then inventory.removeItem(itemName, count) xPlayer.addInventoryItem(itemName, count) - xPlayer.showNotification(_U("have_withdrawn", count, item.label)) + xPlayer.showNotification(TranslateCap("have_withdrawn", count, item.label)) else - xPlayer.showNotification(_U("player_cannot_hold")) + xPlayer.showNotification(TranslateCap("player_cannot_hold")) end else - xPlayer.showNotification(_U("quantity_invalid")) + xPlayer.showNotification(TranslateCap("quantity_invalid")) end end) else @@ -73,9 +73,9 @@ AddEventHandler("bpt_bakerjob:putStockItems", function(itemName, count) if sourceItem.count >= count and count > 0 then xPlayer.removeInventoryItem(itemName, count) inventory.addItem(itemName, count) - xPlayer.showNotification(_U("have_deposited", count, item.label)) + xPlayer.showNotification(TranslateCap("have_deposited", count, item.label)) else - xPlayer.showNotification(_U("quantity_invalid")) + xPlayer.showNotification(TranslateCap("quantity_invalid")) end end) else