From 4bb0279c0a8cc6b35f17276c15798f07b2850c07 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 5 Sep 2024 19:03:57 +0100 Subject: [PATCH] Remove STR_JUST_STATION, it duplicates STR_STATION_NAME --- src/lang/extra/english.txt | 1 - src/order_gui.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index 329412377d..09bdcc5505 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -14,7 +14,6 @@ STR_JUST_TT_TICKS :{TT_TICKS} STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG} STR_JUST_TT_TIME :{TT_TIME} STR_JUST_TT_TIME_ABS :{TT_TIME_ABS} -STR_JUST_STATION :{STATION} STR_RED_INT :{RED}{NUM} diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 455f82695e..049c23a8a7 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -987,7 +987,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int if (st == nullptr) { sp.SetParam(index, STR_ORDER_CONDITIONAL_UNDEFINED_STATION); } else { - sp.SetParam(index, STR_JUST_STATION); + sp.SetParam(index, STR_STATION_NAME); sp.SetParam(index + 1, st->index); } }; @@ -1081,7 +1081,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int if (via_st == nullptr) { tmp_params.SetParam(4, STR_ORDER_CONDITIONAL_UNDEFINED_STATION); } else { - tmp_params.SetParam(4, STR_JUST_STATION); + tmp_params.SetParam(4, STR_STATION_NAME); tmp_params.SetParam(5, via_st->index); } tmp_params.SetParam(6, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + order->GetConditionComparator());