anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

playqueue: Fix generated status string 

- Correct spelling of "minutes"
- Don't pluralize if duration is only 1

Signed-off-by: Anna Schumaker <schumaker.anna@gmail.com>
This commit is contained in:
Anna Schumaker 2014-01-24 16:19:33 -05:00 committed by Anna Schumaker
parent 3d44d20b31
commit e1dbdb3ffb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/playqueue.cpp
View File

@ -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();
}