From 56b67097b9259ad16e9799b39df644d323405bbe Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Tue, 25 Apr 2023 17:08:51 -0700 Subject: [PATCH] "tracks" -> "track" for single-track albums and playlists --- ui/browsing/albumpage.go | 6 +++++- ui/browsing/playlistpage.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/browsing/albumpage.go b/ui/browsing/albumpage.go index 9df1f43..4499b65 100644 --- a/ui/browsing/albumpage.go +++ b/ui/browsing/albumpage.go @@ -257,7 +257,11 @@ func formatMiscLabelStr(a *subsonic.AlbumID3) string { if discCount := a.Song[len(a.Song)-1].DiscNumber; discCount > 1 { discs = fmt.Sprintf("%d discs · ", discCount) } - return fmt.Sprintf("%d · %d tracks · %s%s", a.Year, a.SongCount, discs, util.SecondsToTimeString(float64(a.Duration))) + tracks := "tracks" + if a.SongCount == 1 { + tracks = "track" + } + return fmt.Sprintf("%d · %d %s · %s%s", a.Year, a.SongCount, tracks, discs, util.SecondsToTimeString(float64(a.Duration))) } func (s *albumPageState) Restore() Page { diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go index bcc4af5..014d42f 100644 --- a/ui/browsing/playlistpage.go +++ b/ui/browsing/playlistpage.go @@ -255,7 +255,11 @@ func (a *PlaylistPageHeader) formatPlaylistOwnerStr(p *subsonic.Playlist) string } func (a *PlaylistPageHeader) formatPlaylistTrackTimeStr(p *subsonic.Playlist) string { - return fmt.Sprintf("%d tracks, %s", p.SongCount, util.SecondsToTimeString(float64(p.Duration))) + tracks := "tracks" + if p.SongCount == 1 { + tracks = "track" + } + return fmt.Sprintf("%d %s, %s", p.SongCount, tracks, util.SecondsToTimeString(float64(p.Duration))) } func (s *playlistPageState) Restore() Page {