From 7941eb51871073d46aebdc30990024f264d2aaa5 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Wed, 10 May 2023 18:55:29 +0100
Subject: [PATCH] Simplify timetable leftover ticks string

---
 src/lang/extra/english.txt            |  2 +-
 src/lang/extra/galician.txt           |  2 +-
 src/lang/extra/german.txt             |  2 +-
 src/lang/extra/korean.txt             |  2 +-
 src/lang/extra/simplified_chinese.txt |  2 +-
 src/strings.cpp                       | 12 +++++-------
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt
index ead88d8a11..6e0b911c50 100644
--- a/src/lang/extra/english.txt
+++ b/src/lang/extra/english.txt
@@ -1620,7 +1620,7 @@ STR_TIMETABLE_MINUTES                                           :{COMMA}{NBSP}mi
 STR_TIMETABLE_HOURS                                             :{COMMA}{NBSP}hour{P "" s}
 STR_TIMETABLE_HOURS_MINUTES                                     :{COMMA}{NBSP}hour{P "" s} and {COMMA}{NBSP}minute{P "" s}
 
-STR_TIMETABLE_LEFTOVER_TICKS                                    :{STRING1} + {COMMA} tick{P "" s}
+STR_TIMETABLE_LEFTOVER_TICKS                                    : + {COMMA} tick{P "" s}
 
 STR_TIMETABLE_MINUTES_LONG                                      :{COMMA}{NBSP}minute{P "" s} ({STRING2})
 STR_TIMETABLE_AUTOMATE                                          :{BLACK}Automate
diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt
index b0b909229d..feabf2432b 100644
--- a/src/lang/extra/galician.txt
+++ b/src/lang/extra/galician.txt
@@ -1576,7 +1576,7 @@ STR_TIMETABLE_MINUTES                                           :{COMMA}{NBSP}mi
 STR_TIMETABLE_HOURS                                             :{COMMA}{NBSP}hora{P "" s}
 STR_TIMETABLE_HOURS_MINUTES                                     :{COMMA}{NBSP}hora{P "" s} e {COMMA}{NBSP}minuto{P "" s}
 
-STR_TIMETABLE_LEFTOVER_TICKS                                    :{STRING} + {COMMA} tick{P "" s}
+STR_TIMETABLE_LEFTOVER_TICKS                                    : + {COMMA} tick{P "" s}
 
 STR_TIMETABLE_MINUTES_LONG                                      :{COMMA}{NBSP}minuto{P "" s} ({STRING})
 STR_TIMETABLE_AUTOMATE                                          :{BLACK}Automatizar
diff --git a/src/lang/extra/german.txt b/src/lang/extra/german.txt
index b86a19c3f5..4f120b6043 100644
--- a/src/lang/extra/german.txt
+++ b/src/lang/extra/german.txt
@@ -1469,7 +1469,7 @@ STR_TIMETABLE_MINUTES                                           :{COMMA}{NBSP}Mi
 STR_TIMETABLE_HOURS                                             :{COMMA}{NBSP}Stunde{P "" n}
 STR_TIMETABLE_HOURS_MINUTES                                     :{COMMA}{NBSP}Stunde{P "" n} und {COMMA}{NBSP}Minute{P "" n}
 
-STR_TIMETABLE_LEFTOVER_TICKS                                    :{STRING} + {COMMA} Tick{P "" s}
+STR_TIMETABLE_LEFTOVER_TICKS                                    : + {COMMA} Tick{P "" s}
 
 STR_TIMETABLE_MINUTES_LONG                                      :{COMMA}{NBSP}Minute{P "" n} ({STRING})
 STR_TIMETABLE_AUTOMATE                                          :{BLACK}Automatisieren
diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt
index d90bf8e93b..de18afecc0 100644
--- a/src/lang/extra/korean.txt
+++ b/src/lang/extra/korean.txt
@@ -1581,7 +1581,7 @@ STR_TIMETABLE_MINUTES                                           :{COMMA}분
 STR_TIMETABLE_HOURS                                             :{COMMA}시간
 STR_TIMETABLE_HOURS_MINUTES                                     :{COMMA}시간 {COMMA}분
 
-STR_TIMETABLE_LEFTOVER_TICKS                                    :{STRING} + {COMMA} 틱
+STR_TIMETABLE_LEFTOVER_TICKS                                    : + {COMMA} 틱
 
 STR_TIMETABLE_MINUTES_LONG                                      :{COMMA}분 ({STRING})
 STR_TIMETABLE_AUTOMATE                                          :{BLACK}자동
diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt
index 6d1f2d8a34..bbd3ef8157 100644
--- a/src/lang/extra/simplified_chinese.txt
+++ b/src/lang/extra/simplified_chinese.txt
@@ -1550,7 +1550,7 @@ STR_TIMETABLE_MINUTES                                           :{COMMA}{NBSP}
 STR_TIMETABLE_HOURS                                             :{COMMA}{NBSP}时
 STR_TIMETABLE_HOURS_MINUTES                                     :{COMMA}{NBSP}时{COMMA}{NBSP}分
 
-STR_TIMETABLE_LEFTOVER_TICKS                                    :{STRING} + {COMMA} 刻
+STR_TIMETABLE_LEFTOVER_TICKS                                    : + {COMMA} 刻
 
 STR_TIMETABLE_MINUTES_LONG                                      :{COMMA}{NBSP}分（{STRING})
 STR_TIMETABLE_AUTOMATE                                          :{BLACK}自动
diff --git a/src/strings.cpp b/src/strings.cpp
index 9dc78b0f9e..4c24d56cda 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -1596,18 +1596,16 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
 						};
 						StringParameters tmp_params(args_array);
 						buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_MINUTES_LONG), &tmp_params, last);
-						if (leftover == 0) break;
-						str = STR_EMPTY;
-					}
-					if (leftover != 0) {
-						int64 args_array[3] = { str, units, leftover };
-						StringParameters tmp_params(args_array);
-						buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_LEFTOVER_TICKS), &tmp_params, last);
 					} else {
 						int64 args_array[1] = { units };
 						StringParameters tmp_params(args_array);
 						buff = FormatString(buff, GetStringPtr(str), &tmp_params, last);
 					}
+					if (leftover != 0) {
+						int64 args_array[1] = { leftover };
+						StringParameters tmp_params(args_array);
+						buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_LEFTOVER_TICKS), &tmp_params, last);
+					}
 				}
 				break;