"tracks" -> "track" for single-track albums and playlists
This commit is contained in:
@@ -257,7 +257,11 @@ func formatMiscLabelStr(a *subsonic.AlbumID3) string {
|
|||||||
if discCount := a.Song[len(a.Song)-1].DiscNumber; discCount > 1 {
|
if discCount := a.Song[len(a.Song)-1].DiscNumber; discCount > 1 {
|
||||||
discs = fmt.Sprintf("%d discs · ", discCount)
|
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 {
|
func (s *albumPageState) Restore() Page {
|
||||||
|
|||||||
@@ -255,7 +255,11 @@ func (a *PlaylistPageHeader) formatPlaylistOwnerStr(p *subsonic.Playlist) string
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *PlaylistPageHeader) formatPlaylistTrackTimeStr(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 {
|
func (s *playlistPageState) Restore() Page {
|
||||||
|
|||||||
Reference in New Issue
Block a user