MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devilcius/funkwhale-develop' into develop

This commit is contained in:
Georg Krause 2021-04-07 06:51:23 +02:00
parent 461c55e08c 2dc5acf4f7
commit 5fd7889380
No known key found for this signature in database
GPG Key ID: FD479B9A4D48E632
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/1366.enhancement Normal file
View File

@ -0,0 +1 @@
Adds year to album's card and album's base UI

1
front/src/components/audio/album/Card.vue
View File

@ -20,6 +20,7 @@
</div> </div>
</div> </div>
<div class="extra content"> <div class="extra content">
<span v-if="album.release_date">{{ album.release_date | moment('Y') }} · </span>
<translate translate-context="*/*/*" :translate-params="{count: album.tracks_count}" :translate-n="album.tracks_count" translate-plural="%{ count } tracks">%{ count } track</translate> <translate translate-context="*/*/*" :translate-params="{count: album.tracks_count}" :translate-n="album.tracks_count" translate-plural="%{ count } tracks">%{ count } track</translate>
<play-button class="right floated basic icon" :dropdown-only="true" :is-playable="album.is_playable" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large really discrete']" :album="album"></play-button> <play-button class="right floated basic icon" :dropdown-only="true" :is-playable="album.is_playable" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large really discrete']" :album="album"></play-button>
</div> </div>

4
front/src/components/library/AlbumBase.vue
View File

@ -62,9 +62,9 @@
</h2> </h2>
<artist-label class="rounded" :artist="artist"></artist-label> <artist-label class="rounded" :artist="artist"></artist-label>
</header> </header>
<div class="ui small hidden divider"></div> <div v-if="object.release_date || (totalTracks > 0)" class="ui small hidden divider"></div>
<span v-if="object.release_date">{{ object.release_date | moment('Y') }} · </span>
<template v-if="totalTracks > 0"> <template v-if="totalTracks > 0">
<div class="ui hidden very small divider"></div>
<translate key="1" v-if="isSerie" translate-context="Content/Channel/Paragraph" <translate key="1" v-if="isSerie" translate-context="Content/Channel/Paragraph"
translate-plural="%{ count } episodes" translate-plural="%{ count } episodes"
:translate-n="totalTracks" :translate-n="totalTracks"