From 4d400d91141d94a2639979d72e8b07344c120c62 Mon Sep 17 00:00:00 2001
From: Histalek <16392835+Histalek@users.noreply.github.com>
Date: Wed, 27 Nov 2024 19:09:46 +0100
Subject: [PATCH 1/3] fix(beacon): Use translation for entity instead of
 hardcoded name (#1685)

This fixes #1652
---
 CHANGELOG.md                                          | 1 +
 gamemodes/terrortown/entities/entities/ttt_beacon.lua | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42814b8d74..a2ff1bdfcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - Fixed spectating player still being visible through thermalvision after killing that player (by @MrXonte)
 - Fixed Magneto-stick not using C_Hands (by @SvveetMavis)
 - Fixed console error when dropping ammo for weapons with no AmmoEnt (by @MrXonte)
+- Fixed the beacon not being properly translated when placed (by @Histalek)
 
 ### Changed
 
diff --git a/gamemodes/terrortown/entities/entities/ttt_beacon.lua b/gamemodes/terrortown/entities/entities/ttt_beacon.lua
index e23c577141..a80eb4c28d 100644
--- a/gamemodes/terrortown/entities/entities/ttt_beacon.lua
+++ b/gamemodes/terrortown/entities/entities/ttt_beacon.lua
@@ -10,7 +10,7 @@ DEFINE_BASECLASS("ttt_base_placeable")
 
 if CLIENT then
     ENT.Icon = "vgui/ttt/icon_beacon"
-    ENT.PrintName = "Beacon"
+    ENT.PrintName = "beacon_name"
 end
 
 ENT.Base = "ttt_base_placeable"

From afb0c1885fa5b3a82fd31142992a7d0b6321a08c Mon Sep 17 00:00:00 2001
From: Histalek <16392835+Histalek@users.noreply.github.com>
Date: Wed, 27 Nov 2024 19:19:04 +0100
Subject: [PATCH 2/3] fix(targetid): Respect enabled
 `ttt_identify_body_woconfirm` (#1684)

Before this change when looking at a corpse targetID would show the same
hint whether `ttt_identify_body_woconfirm` was enabled or not.

This change introduces a new language string that does neither mention
corpse confirmation nor searching covertly.
---
 CHANGELOG.md                    | 1 +
 lua/terrortown/lang/en.lua      | 3 +++
 lua/ttt2/libraries/targetid.lua | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2ff1bdfcd..f0ed36923e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - Fixed spectating player still being visible through thermalvision after killing that player (by @MrXonte)
 - Fixed Magneto-stick not using C_Hands (by @SvveetMavis)
 - Fixed console error when dropping ammo for weapons with no AmmoEnt (by @MrXonte)
+- Fixed the targetID corpse hint not respecting `ttt_identify_body_woconfirm` (by @Histalek)
 - Fixed the beacon not being properly translated when placed (by @Histalek)
 
 ### Changed
diff --git a/lua/terrortown/lang/en.lua b/lua/terrortown/lang/en.lua
index 45fac3b728..64a67752f3 100644
--- a/lua/terrortown/lang/en.lua
+++ b/lua/terrortown/lang/en.lua
@@ -2366,3 +2366,6 @@ L.label_loadingscreen_min_duration = "Minimum loading screen display time"
 L.label_keyhelper_leave_vehicle = "leave vehicle"
 L.name_vehicle = "Vehicle"
 L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/ttt2/libraries/targetid.lua b/lua/ttt2/libraries/targetid.lua
index 38d85e834b..6179c2fc31 100644
--- a/lua/ttt2/libraries/targetid.lua
+++ b/lua/ttt2/libraries/targetid.lua
@@ -560,6 +560,11 @@ function targetid.HUDDrawTargetIDRagdolls(tData)
         then
             tData:SetSubtitle(ParT("corpse_hint_inspect_limited", key_params))
             tData:AddDescriptionLine(TryT("corpse_hint_inspect_limited_details"))
+        elseif
+            bodysearch.GetInspectConfirmMode() == 0
+            and not GetConVar("ttt_identify_body_woconfirm"):GetBool()
+        then
+            tData:SetSubtitle(ParT("corpse_hint_without_confirm", key_params))
         else
             tData:SetSubtitle(ParT("corpse_hint", key_params))
         end

From ad73933547ab394f652c5c6c067c323106cfa589 Mon Sep 17 00:00:00 2001
From: "neoxult-ci-bot[bot]"
 <158774459+neoxult-ci-bot[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 18:21:03 +0000
Subject: [PATCH 3/3] Language: Update language files (#1687)

Auto-generated by github actions and the
[ttt2-language_parser](https://github.com/TTT-2/ttt2-language_parser)

Co-authored-by: Histalek <16392835+Histalek@users.noreply.github.com>
---
 lua/terrortown/lang/de.lua      | 3 +++
 lua/terrortown/lang/es.lua      | 3 +++
 lua/terrortown/lang/fr.lua      | 3 +++
 lua/terrortown/lang/it.lua      | 3 +++
 lua/terrortown/lang/ja.lua      | 3 +++
 lua/terrortown/lang/ko.lua      | 3 +++
 lua/terrortown/lang/pl.lua      | 3 +++
 lua/terrortown/lang/pt_br.lua   | 3 +++
 lua/terrortown/lang/ru.lua      | 3 +++
 lua/terrortown/lang/sv.lua      | 3 +++
 lua/terrortown/lang/tr.lua      | 3 +++
 lua/terrortown/lang/uk.lua      | 3 +++
 lua/terrortown/lang/zh_hans.lua | 3 +++
 lua/terrortown/lang/zh_tw.lua   | 3 +++
 14 files changed, 42 insertions(+)

diff --git a/lua/terrortown/lang/de.lua b/lua/terrortown/lang/de.lua
index d64e052385..f4eda0eaf2 100644
--- a/lua/terrortown/lang/de.lua
+++ b/lua/terrortown/lang/de.lua
@@ -2366,3 +2366,6 @@ L.label_voice_activation_mode_toggle_enabled = "Umschalten (Aktiviert zum Start)
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/es.lua b/lua/terrortown/lang/es.lua
index d26ddc1737..46c3bd9823 100644
--- a/lua/terrortown/lang/es.lua
+++ b/lua/terrortown/lang/es.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Colocar el señuelo"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/fr.lua b/lua/terrortown/lang/fr.lua
index 6705ce1f4e..018fe14ae5 100644
--- a/lua/terrortown/lang/fr.lua
+++ b/lua/terrortown/lang/fr.lua
@@ -2366,3 +2366,6 @@ L.label_loadingscreen_min_duration = "Temps d'affichage minimum de l'écran de c
 L.label_keyhelper_leave_vehicle = "sortir du véhicule"
 L.name_vehicle = "Véhicule"
 L.vehicle_enter = "Appuyez sur [{usekey}] pour entrer dans le véhicule"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/it.lua b/lua/terrortown/lang/it.lua
index 1dd08c9835..c7b66fdd25 100644
--- a/lua/terrortown/lang/it.lua
+++ b/lua/terrortown/lang/it.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Piazza un esca"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/ja.lua b/lua/terrortown/lang/ja.lua
index 83840803ae..ea54f3be0a 100644
--- a/lua/terrortown/lang/ja.lua
+++ b/lua/terrortown/lang/ja.lua
@@ -2369,3 +2369,6 @@ L.label_player_role = "役職選択"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/ko.lua b/lua/terrortown/lang/ko.lua
index 9b12a20399..a178051a68 100644
--- a/lua/terrortown/lang/ko.lua
+++ b/lua/terrortown/lang/ko.lua
@@ -2363,3 +2363,6 @@ L.label_crosshair_size_gap = "크로스헤어 공간 배율"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/pl.lua b/lua/terrortown/lang/pl.lua
index 641da80edc..0993e5113b 100644
--- a/lua/terrortown/lang/pl.lua
+++ b/lua/terrortown/lang/pl.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Rozstaw Wabik"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/pt_br.lua b/lua/terrortown/lang/pt_br.lua
index c94c785f47..266facbf96 100644
--- a/lua/terrortown/lang/pt_br.lua
+++ b/lua/terrortown/lang/pt_br.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Plantar a isca"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/ru.lua b/lua/terrortown/lang/ru.lua
index f1b37f682b..bcde109ad3 100644
--- a/lua/terrortown/lang/ru.lua
+++ b/lua/terrortown/lang/ru.lua
@@ -2368,3 +2368,6 @@ L.label_loadingscreen_min_duration = "Минимальное время отоб
 L.label_keyhelper_leave_vehicle = "покинуть транспорт"
 L.name_vehicle = "Транспорт"
 L.vehicle_enter = "[{usekey}] Сесть в транспорт."
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/sv.lua b/lua/terrortown/lang/sv.lua
index 0301b5aa78..d8ad21d5e3 100644
--- a/lua/terrortown/lang/sv.lua
+++ b/lua/terrortown/lang/sv.lua
@@ -2366,3 +2366,6 @@ L.body_confirm_one = "{finder} bekräftade att {victim} har dött."
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/tr.lua b/lua/terrortown/lang/tr.lua
index 6cf0bd918b..99d52fe5d9 100644
--- a/lua/terrortown/lang/tr.lua
+++ b/lua/terrortown/lang/tr.lua
@@ -2366,3 +2366,6 @@ L.label_loadingscreen_min_duration = "Minimum yükleme ekranı görüntüleme s
 L.label_keyhelper_leave_vehicle = "araçtan çık"
 L.name_vehicle = "Araç"
 L.vehicle_enter = "Araca girmek için [{usekey}] tuşuna bas"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/uk.lua b/lua/terrortown/lang/uk.lua
index b2d88d71a3..078d695958 100644
--- a/lua/terrortown/lang/uk.lua
+++ b/lua/terrortown/lang/uk.lua
@@ -2366,3 +2366,6 @@ L.body_confirm_one = "{finder} підтверджує смерть {victim}."
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/zh_hans.lua b/lua/terrortown/lang/zh_hans.lua
index b8b396d8ec..65d54af03a 100644
--- a/lua/terrortown/lang/zh_hans.lua
+++ b/lua/terrortown/lang/zh_hans.lua
@@ -2366,3 +2366,6 @@ L.label_player_role = "选择角色"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/zh_tw.lua b/lua/terrortown/lang/zh_tw.lua
index c5ae964a1e..68b15ce7aa 100644
--- a/lua/terrortown/lang/zh_tw.lua
+++ b/lua/terrortown/lang/zh_tw.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "安放誘餌"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."