From 4470b1f341d7b3aa13ed3f8371f8bfe0218937ca Mon Sep 17 00:00:00 2001
From: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Date: Mon, 22 Jan 2024 19:41:46 -0300
Subject: [PATCH] Cargo - Show item and vehicle in progress bar text (#9747)

* improve cargo progress bar text

* spanish

---------

Co-authored-by: BrettMayson <brett@mayson.io>
---
 addons/cargo/functions/fnc_startLoadIn.sqf |  2 +-
 addons/cargo/functions/fnc_startUnload.sqf |  4 +--
 addons/cargo/stringtable.xml               | 32 +++-------------------
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/addons/cargo/functions/fnc_startLoadIn.sqf b/addons/cargo/functions/fnc_startLoadIn.sqf
index 767e5b8d68..83325b4cde 100644
--- a/addons/cargo/functions/fnc_startLoadIn.sqf
+++ b/addons/cargo/functions/fnc_startLoadIn.sqf
@@ -76,7 +76,7 @@ if ([_item, _vehicle] call FUNC(canLoadItemIn)) then {
                 [QEGVAR(common,fixFloating), _item, _item] call CBA_fnc_targetEvent;
             };
         },
-        LLSTRING(loadingItem),
+        format [LLSTRING(loadingItem), [_item, true] call FUNC(getNameItem), getText (configOf _vehicle >> "displayName")],
         {
             (_this select 0) call FUNC(canLoadItemIn)
         },
diff --git a/addons/cargo/functions/fnc_startUnload.sqf b/addons/cargo/functions/fnc_startUnload.sqf
index 2fe9e923c2..d662bd3f73 100644
--- a/addons/cargo/functions/fnc_startUnload.sqf
+++ b/addons/cargo/functions/fnc_startUnload.sqf
@@ -58,7 +58,7 @@ if (GVAR(interactionParadrop)) exitWith {
                 [LSTRING(unlevelFlightWarning)] call EFUNC(common,displayTextStructured);
             };
         },
-        LLSTRING(unloadingItem),
+        format [LLSTRING(unloadingItem), [_item, true] call FUNC(getNameItem), getText (configOf GVAR(interactionVehicle) >> "displayName")],
         {
             (_this select 0) params ["", "_target"];
 
@@ -109,7 +109,7 @@ if ([_item, GVAR(interactionVehicle), _unit] call FUNC(canUnloadItem)) then {
         {
             TRACE_1("unload fail",_this);
         },
-        LLSTRING(unloadingItem),
+        format [LLSTRING(unloadingItem), [_item, true] call FUNC(getNameItem), getText (configOf GVAR(interactionVehicle) >> "displayName")],
         {
             (_this select 0) params ["_item", "_vehicle", "_unit"];
 
diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml
index 5e42af6c13..579f30d0a7 100644
--- a/addons/cargo/stringtable.xml
+++ b/addons/cargo/stringtable.xml
@@ -241,36 +241,12 @@
             <Chinesesimp>从&lt;br/&gt;%2卸载&lt;br/&gt;%1</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Cargo_LoadingItem">
-            <English>Loading Cargo</English>
-            <German>Belade</German>
-            <Portuguese>Carregando carga</Portuguese>
-            <Polish>Ładowanie cargo</Polish>
-            <Czech>Nakládám</Czech>
-            <Russian>Погрузка</Russian>
-            <Italian>Caricando</Italian>
-            <Spanish>Cargando</Spanish>
-            <French>Chargement de la cargaison</French>
-            <Japanese>カーゴへ積み込んでいます</Japanese>
-            <Korean>화물 싣기</Korean>
-            <Chinese>裝載貨物中</Chinese>
-            <Chinesesimp>正在装载货物</Chinesesimp>
-            <Turkish>Kargo Yükleniyor</Turkish>
+            <English>Loading %1 into %2...</English>
+            <Spanish>Cargando %1 en %2...</Spanish>
         </Key>
         <Key ID="STR_ACE_Cargo_UnloadingItem">
-            <English>Unloading Cargo</English>
-            <German>Entlade</German>
-            <Portuguese>Descarregando carga</Portuguese>
-            <Polish>Rozładowywanie cargo</Polish>
-            <Czech>Vykládám</Czech>
-            <Russian>Выгрузка</Russian>
-            <Italian>Scaricando</Italian>
-            <Spanish>Descargando</Spanish>
-            <French>Déchargement de la cargaison</French>
-            <Japanese>カーゴから降ろしています</Japanese>
-            <Korean>화물 내리기</Korean>
-            <Chinese>卸載貨物中</Chinese>
-            <Chinesesimp>正在卸载货物</Chinesesimp>
-            <Turkish>Kargo Boşaltılıyor</Turkish>
+            <English>Unloading %1 from %2...</English>
+            <Spanish>Descargando %1 de %2...</Spanish>
         </Key>
         <Key ID="STR_ACE_Cargo_LoadingFailed">
             <English>%1&lt;br/&gt;could not be loaded</English>