Commit 9bc90bec authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '170-copy' into 'develop'

See #170: copy and small UI issues

See merge request funkwhale/funkwhale!1082
parents b9f51478 29080ba2
......@@ -13,11 +13,14 @@
</strong>
<div class="description">
<translate class="meta ellipsis" translate-context="Content/Channel/Paragraph"
key="1"
v-if="object.artist.content_category === 'podcast'"
translate-plural="%{ count } episodes"
:translate-n="object.artist.tracks_count"
:translate-params="{count: object.artist.tracks_count}">
%{ count } episode
</translate>
<translate key="2" v-else translate-context="*/*/*" :translate-params="{count: object.artist.tracks_count}" :translate-n="object.artist.tracks_count" translate-plural="%{ count } tracks">%{ count } track</translate>
<tags-list label-classes="tiny" :truncate-size="20" :limit="2" :show-more="false" :tags="object.artist.tags"></tags-list>
</div>
......
......@@ -103,11 +103,19 @@
</router-link>
</div>
</div>
<template v-if="isSerie">
<div class="ui hidden divider"></div>
<rendered-description
v-if="object.description"
:content="object.description"
:can-update="false"></rendered-description>
<router-link v-else-if="$store.state.auth.authenticated && object.is_local" :to="{name: 'library.albums.edit', params: {id: object.id }}">
<i class="pencil icon"></i>
<translate translate-context="Content/*/Button.Label/Verb">Add a description…</translate>
</router-link>
</template>
</div>
<rendered-description
v-if="isSerie"
:content="object.description"
:can-update="false"></rendered-description>
<div class="nine wide column">
<router-view v-if="object" :is-serie="isSerie" :artist="artist" :discs="discs" @libraries-loaded="libraries = $event" :object="object" object-type="album" :key="$route.fullPath"></router-view>
</div>
......
......@@ -7,7 +7,8 @@
<img class="image" v-if="cover && cover.original" v-lazy="$store.getters['instance/absoluteUrl'](cover.square_crop)">
<template v-if="upload">
<h3 class="ui header">
<translate translate-context="Content/*/*">Track Details</translate>
<translate key="1" v-if="track.artist.content_category === 'music'" translate-context="Content/*/*">Track Details</translate>
<translate key="2" v-else translate-context="Content/*/*">Episode Details</translate>
</h3>
<table class="ui basic table">
<tbody>
......@@ -78,7 +79,8 @@
</tr>
<tr v-if="track.album">
<td>
<translate translate-context="*/*/*/Noun">Album</translate>
<translate key="1" v-if="track.album.artist.content_category === 'music'" translate-context="*/*/*/Noun">Album</translate>
<translate key="2" v-else translate-context="*/*/*">Serie</translate>
</td>
<td class="right aligned">
<router-link :to="{name: 'library.albums.detail', params: {id: track.album.id}}">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment