Merge pull request #1693 from Gymnasiast/fix-1-week-remaining

Fix '1 weeks remaining'
This commit is contained in:
Duncan 2015-07-27 16:54:06 +01:00
commit 56172c6b1b
3 changed files with 3 additions and 1 deletions

View File

@ -3820,3 +3820,4 @@ STR_5480 :Show toolbar buttons for:
STR_5481 :Themes
STR_5482 :{WINDOW_COLOUR_2}Time since last inspection: {BLACK}1 minute
STR_5483 :{BLACK}({COMMA16} weeks remaining)
STR_5484 :{BLACK}({COMMA16} week remaining)

View File

@ -1825,6 +1825,7 @@ enum {
STR_TIME_SINCE_LAST_INSPECTION_MINUTE = 5482,
STR_X_WEEKS_REMAINING = 5483,
STR_1_WEEK_REMAINING = 5484,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768

View File

@ -1213,7 +1213,7 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp
// Duration
weeksRemaining = (gMarketingCampaignDaysLeft[i] % 128);
gfx_draw_string_left(dpi, STR_X_WEEKS_REMAINING, &weeksRemaining, 0, x + 304, y);
gfx_draw_string_left(dpi, weeksRemaining == 1 ? STR_1_WEEK_REMAINING : STR_X_WEEKS_REMAINING, &weeksRemaining, 0, x + 304, y);
y += 10;
}