From 8a4d60b8127c7d8d5ee9be7d77c6565f98ca392a Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 25 Dec 2025 04:29:58 +0000 Subject: [PATCH] Fix #14973: Incorrect colour for some composed strings. --- src/cargotype.cpp | 4 +--- src/lang/english.txt | 6 +++--- src/roadveh_gui.cpp | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/cargotype.cpp b/src/cargotype.cpp index 2ed881223f..6a397675cf 100644 --- a/src/cargotype.cpp +++ b/src/cargotype.cpp @@ -268,9 +268,7 @@ std::optional BuildCargoAcceptanceString(const CargoArray &acceptan { std::string_view list_separator = GetListSeparator(); - /* Cargo acceptance is displayed in a extra multiline */ std::stringstream line; - line << GetString(label); bool found = false; for (const CargoSpec *cs : _sorted_cargo_specs) { @@ -289,7 +287,7 @@ std::optional BuildCargoAcceptanceString(const CargoArray &acceptan } } - if (found) return line.str(); + if (found) return GetString(label, line.str()); return std::nullopt; } diff --git a/src/lang/english.txt b/src/lang/english.txt index 11be163464..c7c24b37e2 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2871,7 +2871,7 @@ STR_HOUSE_PICKER_YEARS_ANY :{BLACK}Years: { STR_HOUSE_PICKER_YEARS_FROM :{BLACK}Years: {GOLD}From {NUM} STR_HOUSE_PICKER_YEARS_UNTIL :{BLACK}Years: {GOLD}Until {NUM} STR_HOUSE_PICKER_SIZE :{BLACK}Size: {GOLD}{NUM}x{NUM} tiles -STR_HOUSE_PICKER_CARGO_ACCEPTED :{BLACK}Cargo accepted: {GOLD} +STR_HOUSE_PICKER_CARGO_ACCEPTED :{BLACK}Cargo accepted: {GOLD}{RAW_STRING} STR_HOUSE_PICKER_CARGO_PRODUCED :{BLACK}Cargo produced: {GOLD}{CARGO_LIST} STR_HOUSE_PICKER_CLASS_ZONE1 :Edge @@ -3159,7 +3159,7 @@ STR_LAND_AREA_INFORMATION_AIRPORT_CLASS :{BLACK}Airport STR_LAND_AREA_INFORMATION_AIRPORT_NAME :{BLACK}Airport name: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Airport tile name: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{RAW_STRING} -STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Cargo accepted: {LTBLUE} +STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Cargo accepted: {LTBLUE}{RAW_STRING} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) STR_LANG_AREA_INFORMATION_RAIL_TYPE :{BLACK}Rail type: {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_ROAD_TYPE :{BLACK}Road type: {LTBLUE}{STRING} @@ -4594,7 +4594,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP :{BLACK}Show cap STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO :{BLACK}Total Cargo STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP :{BLACK}Show total capacity of train, split by cargo type -STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY :{BLACK}Capacity: {LTBLUE} +STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY :{BLACK}Capacity: {LTBLUE}{RAW_STRING} # Vehicle refit STR_REFIT_CAPTION :{WHITE}{VEHICLE} (Refit) diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp index 5ffbe8c9e4..974ab5e960 100644 --- a/src/roadveh_gui.cpp +++ b/src/roadveh_gui.cpp @@ -46,7 +46,7 @@ void DrawRoadVehDetails(const Vehicle *v, const Rect &r) } } - std::string capacity = GetString(STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY); + std::string capacity; std::string_view list_separator = GetListSeparator(); bool first = true; @@ -66,7 +66,7 @@ void DrawRoadVehDetails(const Vehicle *v, const Rect &r) } } - DrawString(r.left, r.right, y, capacity, TC_BLUE); + DrawString(r.left, r.right, y, GetString(STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY, capacity), TC_BLUE); y += GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal; for (const Vehicle *u = v; u != nullptr; u = u->Next()) {