Simplify timetable long duration hours and minutes suffix string

pull/519/head
Jonathan G Rennison 1 year ago
parent 7941eb5187
commit 4c18a193e7

@ -1619,10 +1619,10 @@ STR_ORDER_RELEASE_SLOT :Release slot: {
STR_TIMETABLE_MINUTES :{COMMA}{NBSP}minute{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_MINUTES_SUFFIX : ({STRING2})
STR_TIMETABLE_LEFTOVER_TICKS : + {COMMA} tick{P "" s}
STR_TIMETABLE_MINUTES_LONG :{COMMA}{NBSP}minute{P "" s} ({STRING2})
STR_TIMETABLE_AUTOMATE :{BLACK}Automate
STR_TIMETABLE_AUTOMATE_TOOLTIP :{BLACK}Manage the timetables automatically by updating the values for each journey

@ -1575,10 +1575,10 @@ STR_ORDER_RELEASE_SLOT :Liberar slot: {
STR_TIMETABLE_MINUTES :{COMMA}{NBSP}minuto{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_MINUTES_SUFFIX : ({STRING})
STR_TIMETABLE_LEFTOVER_TICKS : + {COMMA} tick{P "" s}
STR_TIMETABLE_MINUTES_LONG :{COMMA}{NBSP}minuto{P "" s} ({STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}Automatizar
STR_TIMETABLE_AUTOMATE_TOOLTIP :{BLACK}Xestiona os horarios automáticamente actualizando os valores para cada viaxe

@ -1468,10 +1468,10 @@ STR_ORDER_RELEASE_SLOT :Gib Slot {STRIN
STR_TIMETABLE_MINUTES :{COMMA}{NBSP}Minute{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_MINUTES_SUFFIX : ({STRING})
STR_TIMETABLE_LEFTOVER_TICKS : + {COMMA} Tick{P "" s}
STR_TIMETABLE_MINUTES_LONG :{COMMA}{NBSP}Minute{P "" n} ({STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}Automatisieren
STR_TIMETABLE_AUTOMATE_TOOLTIP :{BLACK}Verwaltet den Fahrplan durch automatisches Erfassen der Werte jeder Fahrt

@ -1580,10 +1580,10 @@ STR_ORDER_RELEASE_SLOT :슬롯 해제:
STR_TIMETABLE_MINUTES :{COMMA}분
STR_TIMETABLE_HOURS :{COMMA}시간
STR_TIMETABLE_HOURS_MINUTES :{COMMA}시간 {COMMA}분
STR_TIMETABLE_MINUTES_SUFFIX : ({STRING})
STR_TIMETABLE_LEFTOVER_TICKS : + {COMMA} 틱
STR_TIMETABLE_MINUTES_LONG :{COMMA}분 ({STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}자동
STR_TIMETABLE_AUTOMATE_TOOLTIP :{BLACK}각 운행마다 자동으로 값을 얻어 시간표를 만듭니다.

@ -1549,10 +1549,10 @@ STR_ORDER_RELEASE_SLOT :Release slot
STR_TIMETABLE_MINUTES :{COMMA}{NBSP}分
STR_TIMETABLE_HOURS :{COMMA}{NBSP}时
STR_TIMETABLE_HOURS_MINUTES :{COMMA}{NBSP}时{COMMA}{NBSP}分
STR_TIMETABLE_MINUTES_SUFFIX :{STRING})
STR_TIMETABLE_LEFTOVER_TICKS : + {COMMA} 刻
STR_TIMETABLE_MINUTES_LONG :{COMMA}{NBSP}分({STRING})
STR_TIMETABLE_AUTOMATE :{BLACK}自动
STR_TIMETABLE_AUTOMATE_TOOLTIP :{BLACK}通过更新每次运行的值来自动管理时间表

@ -1585,21 +1585,19 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
int64 ratio = DATE_UNIT_SIZE;
int64 units = ticks / ratio;
int64 leftover = _settings_client.gui.timetable_leftover_ticks ? ticks % ratio : 0;
int64 args_array[1] = { units };
StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(str), &tmp_params, last);
if (b == SCC_TT_TICKS_LONG && _settings_time.time_in_minutes && units > 59) {
int64 hours = units / 60;
int64 minutes = units % 60;
int64 args_array[4] = {
units,
int64 args_array[3] = {
(minutes != 0) ? STR_TIMETABLE_HOURS_MINUTES : STR_TIMETABLE_HOURS,
hours,
minutes
};
StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_MINUTES_LONG), &tmp_params, last);
} else {
int64 args_array[1] = { units };
StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(str), &tmp_params, last);
buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_MINUTES_SUFFIX), &tmp_params, last);
}
if (leftover != 0) {
int64 args_array[1] = { leftover };

Loading…
Cancel
Save