From e1dbdb3ffb588143f8258acdbb5999ea3b69526f Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Fri, 24 Jan 2014 16:19:33 -0500 Subject: [PATCH] playqueue: Fix generated status string - Correct spelling of "minutes" - Don't pluralize if duration is only 1 Signed-off-by: Anna Schumaker --- lib/playqueue.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/playqueue.cpp b/lib/playqueue.cpp index ee7187cb..edc8a2cc 100644 --- a/lib/playqueue.cpp +++ b/lib/playqueue.cpp @@ -67,6 +67,8 @@ static inline void add_duration(std::stringstream &ss, unsigned int dur, { if (dur > 0) { ss << dur << " " << field; + if (dur > 1) + ss << "s"; if (remaining > 0) ss << ", "; } @@ -79,15 +81,15 @@ std::string Playqueue :: get_length_str() unsigned int days = len / O_DAYS; len -= days * O_DAYS; - add_duration(ss, days, len, "days"); + add_duration(ss, days, len, "day"); unsigned int hours = len / O_HOURS; len -= hours *O_HOURS; - add_duration(ss, hours, len, "hours"); + add_duration(ss, hours, len, "hour"); unsigned int mins = len / O_MINUTES; - add_duration(ss, mins, len, "miutes"); + add_duration(ss, mins, len, "minute"); unsigned int secs = len - (mins * O_MINUTES); - add_duration(ss, secs, 0, "seconds"); + add_duration(ss, secs, 0, "second"); return ss.str(); }