From 03b92ffaf99d368957f28d2738aeb51d852fc336 Mon Sep 17 00:00:00 2001 From: Foone Turing Date: Fri, 27 Aug 2021 10:44:58 -0700 Subject: [PATCH] Fixing pluralization of "days" --- source/Win95Uptime.cpp | 4 ++-- source/Win95Uptime.rc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Win95Uptime.cpp b/source/Win95Uptime.cpp index ffbc186..2ea1d85 100644 --- a/source/Win95Uptime.cpp +++ b/source/Win95Uptime.cpp @@ -381,8 +381,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) int crash_minutes = (TTL/1000/60) % 60; GetCrashTime(last_text_update, crash_date, 100); - sprintf(buffer,"%s milliseconds since boot\n%d days %02dh:%02dm\n%s ms until CRASH TIME\nTTL: %d days %02dh:%02dm\nEstimated crash time: %s\n%s", - numberbuffer,days,hours,minutes,crashbuffer,crash_days,crash_hours,crash_minutes, crash_date, patch_status); + sprintf(buffer,"%s milliseconds since boot\n%d day%s %02dh:%02dm\n%s ms until CRASH TIME\nTTL: %d day%s %02dh:%02dm\nEstimated crash time: %s\n%s", + numberbuffer,days,(days==1?"":"s"),hours,minutes,crashbuffer,crash_days,(crash_days==1?"":"s"),crash_hours,crash_minutes, crash_date, patch_status); SelectObject(hBackBuf, hFont); DrawText(hBackBuf, buffer, strlen(buffer), &rt, DT_CENTER); diff --git a/source/Win95Uptime.rc b/source/Win95Uptime.rc index a56d5e2..0a1ddbb 100644 --- a/source/Win95Uptime.rc +++ b/source/Win95Uptime.rc @@ -79,7 +79,7 @@ FONT 8, "System" BEGIN LTEXT "Copyright (C) 2021 Foone Turing",IDC_STATIC,49,20,119,8 ICON IDI_CLOCK,IDC_MYICON,14,9,20,20 - LTEXT "Win95Uptime Version 1.6",IDC_STATIC,49,10,119,8, + LTEXT "Win95Uptime Version 1.7",IDC_STATIC,49,10,119,8, SS_NOPREFIX DEFPUSHBUTTON "OK",IDOK,195,50,30,11,WS_GROUP LTEXT "Made in Jest by @foone",IDC_STATIC,49,30,119,8