Commit bcc71280 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '175-i18n-typos' into 'develop'

Resolve "i18n typos"

Closes #175

See merge request funkwhale/funkwhale!161
parents 9124c7a9 912c98c7
Typos/not showing text due to i18n work (#175)
......@@ -5,10 +5,10 @@
</div>
<div class="content">
<div class="summary">
<i18next path="{%0%} favorited a track {%1%}">
<slot name="user"></slot>
<slot name="date"></slot>
<i18next path="{%0%} favorited a track">
<username class="user" :username="event.actor.local_id" />
</i18next>
<human-date class="date" :date="event.published" />
</div>
<div class="extra text">
<router-link :to="{name: 'library.tracks.detail', params: {id: event.object.local_id }}">{{ event.object.name }}</router-link>
......
......@@ -5,16 +5,16 @@
</div>
<div class="content">
<div class="summary">
<i18next path="{%0%} listened to a track {%1%}">
<slot name="user"></slot>
<slot name="date"></slot>
<i18next path="{%0%} listened to a track">
<username class="user" :username="event.actor.local_id" />
</i18next>
<human-date class="date" :date="event.published" />
</div>
<div class="extra text">
<router-link :to="{name: 'library.tracks.detail', params: {id: event.object.local_id }}">{{ event.object.name }}</router-link>
<i18next path="from album {%0%}, by {%1%}" v-if="event.object.album">
{{ event.object.album }}
<em>{{ event.object.artist }}</em>
{{ event.object.album }}<em>{{ event.object.artist }}</em>
</i18next>
<i18next path=", by {%0%}" v-else>
<em>{{ event.object.artist }}</em>
......
......@@ -11,10 +11,7 @@
<div class="content">
{{ artist.name }}
<div class="sub header">
<i18next path="{%0%} tracks in {%1%} albums">
{{ totalTracks }}
{{ albums.length }}
</i18next>
{{ $t('{% track_count %} tracks in {% album_count %} albums', {track_count: totalTracks, album_count: albums.length})}}
</div>
</div>
</h2>
......
......@@ -14,12 +14,6 @@
v-if="components[event.type]"
:is="components[event.type]"
:event="event">
<username
class="user"
:username="event.actor.local_id"
slot="user"></username>
{{ event.published }}
<human-date class="date" :date="event.published" slot="date"></human-date>
</component>
</div>
</div>
......
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