dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify timetable leftover ticks string

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-05-10 18:55:29 +01:00
parent e7f7cd06bd
commit 7941eb5187
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/extra/english.txt
View File

@@ -1620,7 +1620,7 @@ STR_TIMETABLE_MINUTES :{COMMA}{NBSP}mi
STR_TIMETABLE_HOURS :{COMMA}{NBSP}hour{P "" s} 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_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_MINUTES_LONG :{COMMA}{NBSP}minute{P "" s} ({STRING2})
STR_TIMETABLE_AUTOMATE :{BLACK}Automate STR_TIMETABLE_AUTOMATE :{BLACK}Automate

2
src/lang/extra/galician.txt
View File

@@ -1576,7 +1576,7 @@ STR_TIMETABLE_MINUTES :{COMMA}{NBSP}mi
STR_TIMETABLE_HOURS :{COMMA}{NBSP}hora{P "" s} 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_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_MINUTES_LONG :{COMMA}{NBSP}minuto{P "" s} ({STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}Automatizar STR_TIMETABLE_AUTOMATE :{BLACK}Automatizar

2
src/lang/extra/german.txt
View File

@@ -1469,7 +1469,7 @@ STR_TIMETABLE_MINUTES :{COMMA}{NBSP}Mi
STR_TIMETABLE_HOURS :{COMMA}{NBSP}Stunde{P "" n} 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_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_MINUTES_LONG :{COMMA}{NBSP}Minute{P "" n} ({STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}Automatisieren STR_TIMETABLE_AUTOMATE :{BLACK}Automatisieren

2
src/lang/extra/korean.txt
View File

@@ -1581,7 +1581,7 @@ STR_TIMETABLE_MINUTES :{COMMA}분
STR_TIMETABLE_HOURS :{COMMA}시간 STR_TIMETABLE_HOURS :{COMMA}시간
STR_TIMETABLE_HOURS_MINUTES :{COMMA}시간 {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_MINUTES_LONG :{COMMA}분 ({STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}자동 STR_TIMETABLE_AUTOMATE :{BLACK}자동

2
src/lang/extra/simplified_chinese.txt
View File

@@ -1550,7 +1550,7 @@ STR_TIMETABLE_MINUTES :{COMMA}{NBSP}
STR_TIMETABLE_HOURS :{COMMA}{NBSP}时 STR_TIMETABLE_HOURS :{COMMA}{NBSP}时
STR_TIMETABLE_HOURS_MINUTES :{COMMA}{NBSP}时{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_MINUTES_LONG :{COMMA}{NBSP}分（{STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}自动 STR_TIMETABLE_AUTOMATE :{BLACK}自动

12
src/strings.cpp
View File

@@ -1596,18 +1596,16 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
}; };
StringParameters tmp_params(args_array); StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_MINUTES_LONG), &tmp_params, last); 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 { } else {
int64 args_array[1] = { units }; int64 args_array[1] = { units };
StringParameters tmp_params(args_array); StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(str), &tmp_params, last); 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; break;