diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 7d646b259e..fee63adad0 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -4038,7 +4038,6 @@ STR_5732 :Anisotropic STR_5733 :Use NN scaling at integer scales # tooltip for tab in options window STR_5734 :{SMALLFONT}{BLACK}Rendering -<<<<<<< HEAD STR_5735 :Network Status STR_5736 :Player STR_5737 :Closed, {COMMA16} person still on ride @@ -4080,10 +4079,12 @@ STR_5772 :Age STR_5773 :Total customers: {COMMA32} STR_5774 :Total profit: {CURRENCY2DP} STR_5775 :Customers: {COMMA32} per hour -STR_5776 :Age: {COMMA16} year(s) -STR_5777 :Income: {CURRENCY2DP} per hour -STR_5778 :Running cost: {CURRENCY2DP} per hour -STR_5779 :Running cost: Unknown +STR_5776 :Built: This Year +STR_5777 :Built: Last Year +STR_5778 :Built: {COMMA16} Years Ago +STR_5779 :Income: {CURRENCY2DP} per hour +STR_5780 :Running cost: {CURRENCY2DP} per hour +STR_5781 :Running cost: Unknown ############# # Scenarios # diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index 80ab22ef51..826cc922a9 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -2389,10 +2389,12 @@ enum { STR_RIDE_LIST_TOTAL_CUSTOMERS_LABEL = 5773, STR_RIDE_LIST_TOTAL_PROFIT_LABEL = 5774, STR_RIDE_LIST_CUSTOMERS_PER_HOUR_LABEL = 5775, - STR_RIDE_LIST_AGE_LABEL = 5776, - STR_RIDE_LIST_INCOME_LABEL = 5777, - STR_RIDE_LIST_RUNNING_COST_LABEL = 5778, - STR_RIDE_LIST_RUNNING_COST_UNKNOWN = 5779, + STR_RIDE_LIST_BUILT_THIS_YEAR_LABEL = 5776, + STR_RIDE_LIST_BUILT_LAST_YEAR_LABEL = 5777, + STR_RIDE_LIST_BUILT_X_YEARS_AGO_LABEL = 5778, + STR_RIDE_LIST_INCOME_LABEL = 5779, + STR_RIDE_LIST_RUNNING_COST_LABEL = 5780, + STR_RIDE_LIST_RUNNING_COST_UNKNOWN = 5781, // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 diff --git a/src/windows/ride_list.c b/src/windows/ride_list.c index f0f32f556e..c9d4a3a7fc 100644 --- a/src/windows/ride_list.c +++ b/src/windows/ride_list.c @@ -539,9 +539,14 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, formatSecondary = STR_RIDE_LIST_CUSTOMERS_PER_HOUR_LABEL; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride_customers_per_hour(ride); break; - case INFORMATION_TYPE_AGE: - formatSecondary = STR_RIDE_LIST_AGE_LABEL; - RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, sint16) = (sint16)date_get_year(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, uint16) - ride->build_date); + case INFORMATION_TYPE_AGE:; + sint16 age = date_get_year(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, uint16) - ride->build_date); + switch (age) { + case 0: formatSecondary = STR_RIDE_LIST_BUILT_THIS_YEAR_LABEL; break; + case 1: formatSecondary = STR_RIDE_LIST_BUILT_LAST_YEAR_LABEL; break; + default: formatSecondary = STR_RIDE_LIST_BUILT_X_YEARS_AGO_LABEL; break; + } + RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, sint16) = age; break; case INFORMATION_TYPE_INCOME: formatSecondary = 0;