Merge branch 'sourcestringmodif' into 'develop'

Enhancements in frontend

See merge request funkwhale/funkwhale!557
This commit is contained in:
Eliot Berriot 2019-01-24 14:32:36 +01:00
commit 02140c2376
12 changed files with 13 additions and 15 deletions

View File

@ -67,7 +67,7 @@ export default {
}, },
title () { title () {
if (this.playable) { if (this.playable) {
return this.$gettext('Play now') return this.$gettext('Play...')
} else { } else {
if (this.track) { if (this.track) {
return this.$gettext('This track is not available in any library you have access to') return this.$gettext('This track is not available in any library you have access to')

View File

@ -65,7 +65,7 @@
<translate>We cannot load this track</translate> <translate>We cannot load this track</translate>
</div> </div>
<p v-if="hasNext && playing && $store.state.player.errorCount < $store.state.player.maxConsecutiveErrors"> <p v-if="hasNext && playing && $store.state.player.errorCount < $store.state.player.maxConsecutiveErrors">
<translate>The next track will play automatically in a few seconds...</translate> <translate>The next track will play automatically in a few seconds</translate>
<i class="loading spinner icon"></i> <i class="loading spinner icon"></i>
</p> </p>
<p> <p>

View File

@ -10,7 +10,7 @@
<img class="ui big circular image" v-else v-lazy="$store.getters['instance/absoluteUrl'](profile.avatar.square_crop)" /> <img class="ui big circular image" v-else v-lazy="$store.getters['instance/absoluteUrl'](profile.avatar.square_crop)" />
<div class="content"> <div class="content">
{{ profile.username }} {{ profile.username }}
<div class="sub header" v-translate="{date: signupDate}">Registered since %{ date }</div> <div class="sub header" v-translate="{date: signupDate}">Member since %{ date }</div>
</div> </div>
</h2> </h2>
<div class="ui basic green label"> <div class="ui basic green label">

View File

@ -68,8 +68,7 @@
<translate>Change my password</translate> <translate>Change my password</translate>
</h2> </h2>
<div class="ui message"> <div class="ui message">
<translate>Changing your password will also change your Subsonic API password if you have requested one.</translate> <translate>Changing your password will also change your Subsonic API password if you have requested one.</translate>&nbsp;<translate>You will have to update your password on your clients that use this password.</translate>
<translate>You will have to update your password on your clients that use this password.</translate>
</div> </div>
<form class="ui form" @submit.prevent="submitPassword()"> <form class="ui form" @submit.prevent="submitPassword()">
<div v-if="passwordError" class="ui negative message"> <div v-if="passwordError" class="ui negative message">

View File

@ -5,8 +5,7 @@
<translate>The Subsonic API is not available on this Funkwhale instance.</translate> <translate>The Subsonic API is not available on this Funkwhale instance.</translate>
</p> </p>
<p> <p>
<translate>Funkwhale is compatible with other music players that support the Subsonic API.</translate> <translate>Funkwhale is compatible with other music players that support the Subsonic API.</translate>&nbsp;<translate>You can use those to enjoy your playlist and music in offline mode, on your smartphone or tablet, for instance.</translate>
<translate>You can use those to enjoy your playlist and music in offline mode, on your smartphone or tablet, for instance.</translate>
</p> </p>
<p> <p>
<translate>However, accessing Funkwhale from those clients require a separate password you can set below.</translate> <translate>However, accessing Funkwhale from those clients require a separate password you can set below.</translate>

View File

@ -168,7 +168,7 @@ export default {
computed: { computed: {
labels () { labels () {
return { return {
searchPlaceholder: this.$gettext('Search by domain, username, bio...') searchPlaceholder: this.$gettext('Search by domain, username, bio')
} }
}, },
actionFilters () { actionFilters () {

View File

@ -148,7 +148,7 @@ export default {
computed: { computed: {
labels () { labels () {
return { return {
searchPlaceholder: this.$gettext('Search by name...') searchPlaceholder: this.$gettext('Search by name')
} }
}, },
actionFilters () { actionFilters () {

View File

@ -22,11 +22,11 @@
<div v-else class="ui list"> <div v-else class="ui list">
<div class="ui item" v-if="object.silence_activity"> <div class="ui item" v-if="object.silence_activity">
<i class="feed icon"></i> <i class="feed icon"></i>
<div class="content"><translate>Silence activity</translate></div> <div class="content"><translate>Mute activity</translate></div>
</div> </div>
<div class="ui item" v-if="object.silence_notifications"> <div class="ui item" v-if="object.silence_notifications">
<i class="bell icon"></i> <i class="bell icon"></i>
<div class="content"><translate>Silence notifications</translate></div> <div class="content"><translate>Mute notifications</translate></div>
</div> </div>
<div class="ui item" v-if="object.reject_media"> <div class="ui item" v-if="object.reject_media">
<i class="file icon"></i> <i class="file icon"></i>

View File

@ -112,7 +112,7 @@ export default {
blockAllHelp: this.$gettext("Block everything from this account or domain. This will prevent any interaction with the entity, and purge related content (uploads, libraries, follows, etc.)"), blockAllHelp: this.$gettext("Block everything from this account or domain. This will prevent any interaction with the entity, and purge related content (uploads, libraries, follows, etc.)"),
silenceActivity: { silenceActivity: {
help: this.$gettext("Hide account or domain content, except from followers."), help: this.$gettext("Hide account or domain content, except from followers."),
label: this.$gettext("Silence activity"), label: this.$gettext("Mute activity"),
}, },
silenceNotifications: { silenceNotifications: {
help: this.$gettext("Prevent account or domain from triggering notifications, except from followers."), help: this.$gettext("Prevent account or domain from triggering notifications, except from followers."),

View File

@ -160,7 +160,7 @@ export default {
}), }),
labels () { labels () {
return { return {
copyTitle: this.$gettext('Copy tracks from current queue to playlist') copyTitle: this.$gettext('Copy queued tracks to playlist')
} }
}, },
status () { status () {

View File

@ -24,7 +24,7 @@
</tbody> </tbody>
</table> </table>
<p v-else> <p v-else>
<translate>No notifications yet.</translate> <translate>No notification to show.</translate>
</p> </p>
</div> </div>
</section> </section>

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="ui vertical aligned stripe segment"> <div class="ui vertical aligned stripe segment">
<div v-if="isLoading" :class="['ui', {'active': isLoading}, 'inverted', 'dimmer']"> <div v-if="isLoading" :class="['ui', {'active': isLoading}, 'inverted', 'dimmer']">
<div class="ui text loader"><translate>Loading remote libraries...</translate></div> <div class="ui text loader"><translate>Loading remote libraries</translate></div>
</div> </div>
<div v-else class="ui text container"> <div v-else class="ui text container">
<h1 class="ui header"><translate>Remote libraries</translate></h1> <h1 class="ui header"><translate>Remote libraries</translate></h1>