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

Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-03-20 11:36:16 +01:00
parent b70636c2d8 41fa4f62cf
commit b12c823dd9
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
8 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/652.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed escaping issues in translated strings (#652)

1
changes/changelog.d/751.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed saving moderation policy when clicking on "Cancel" (#751)

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

@ -11,7 +11,7 @@
<div class="meta"> <div class="meta">
<span> <span>
<router-link tag="span" :to="{name: 'library.artists.detail', params: {id: album.artist.id }}"> <router-link tag="span" :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
<translate translate-context="Content/Album/Card" :translate-params="{artist: album.artist.name}">By %{ artist }</translate> <span v-translate="{artist: album.artist.name}" translate-context="Content/Album/Card" :translate-params="{artist: album.artist.name}">By %{ artist }</translate>
</router-link> </router-link>
</span><span class="time" v-if="album.release_date">– {{ album.release_date | year }}</span> </span><span class="time" v-if="album.release_date">– {{ album.release_date | year }}</span>
</div> </div>

2
front/src/components/manage/moderation/InstancePolicyForm.vue
View File

@ -51,7 +51,7 @@
</div> </div>
</div> </div>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<button @click="$emit('cancel')" class="ui basic left floated button"> <button @click.prevent="$emit('cancel')" class="ui basic left floated button">
<translate translate-context="*/*/Button.Label/Verb">Cancel</translate> <translate translate-context="*/*/Button.Label/Verb">Cancel</translate>
</button> </button>
<button :class="['ui', 'right', 'floated', 'green', {'disabled loading': isLoading}, 'button']" :disabled="isLoading"> <button :class="['ui', 'right', 'floated', 'green', {'disabled loading': isLoading}, 'button']" :disabled="isLoading">

4
front/src/components/playlists/Editor.vue
View File

@ -39,8 +39,8 @@
<dangerous-button :disabled="plts.length === 0" class="labeled right floated icon" color='yellow' :action="clearPlaylist"> <dangerous-button :disabled="plts.length === 0" class="labeled right floated icon" color='yellow' :action="clearPlaylist">
<i class="eraser icon"></i> <translate translate-context="*/Playlist/Button.Label/Verb">Clear playlist</translate> <i class="eraser icon"></i> <translate translate-context="*/Playlist/Button.Label/Verb">Clear playlist</translate>
<p slot="modal-header"> <p slot="modal-header" v-translate="{playlist: playlist.name}" translate-context="Popup/Playlist/Title" :translate-params="{playlist: playlist.name}">
<translate translate-context="Popup/Playlist/Title" :translate-params="{playlist: playlist.name}">Do you want to clear the playlist "%{ playlist }"?</translate> Do you want to clear the playlist "%{ playlist }"?
</p> </p>
<p slot="modal-content"><translate translate-context="Popup/Playlist/Paragraph">This will remove all tracks from this playlist and cannot be undone.</translate></p> <p slot="modal-content"><translate translate-context="Popup/Playlist/Paragraph">This will remove all tracks from this playlist and cannot be undone.</translate></p>
<div slot="modal-confirm"><translate translate-context="*/Playlist/Button.Label/Verb">Clear playlist</translate></div> <div slot="modal-confirm"><translate translate-context="*/Playlist/Button.Label/Verb">Clear playlist</translate></div>

5
front/src/components/playlists/PlaylistModal.vue
View File

@ -7,11 +7,12 @@
<div class="description"> <div class="description">
<template v-if="track"> <template v-if="track">
<h4 class="ui header"><translate translate-context="Popup/Playlist/Title">Current track</translate></h4> <h4 class="ui header"><translate translate-context="Popup/Playlist/Title">Current track</translate></h4>
<translate translate-context="Popup/Playlist/Paragraph" <span
translate-context="Popup/Playlist/Paragraph"
v-translate="{artist: track.artist.name, title: track.title}" v-translate="{artist: track.artist.name, title: track.title}"
:translate-params="{artist: track.artist.name, title: track.title}"> :translate-params="{artist: track.artist.name, title: track.title}">
"%{ title }", by %{ artist } "%{ title }", by %{ artist }
</translate> </span>
<div class="ui divider"></div> <div class="ui divider"></div>
</template> </template>

4
front/src/views/playlists/Detail.vue
View File

@ -33,8 +33,8 @@
</button> </button>
<dangerous-button v-if="$store.state.auth.profile && playlist.user.id === $store.state.auth.profile.id" class="labeled icon" :action="deletePlaylist"> <dangerous-button v-if="$store.state.auth.profile && playlist.user.id === $store.state.auth.profile.id" class="labeled icon" :action="deletePlaylist">
<i class="trash icon"></i> <translate translate-context="*/*/*/Verb">Delete</translate> <i class="trash icon"></i> <translate translate-context="*/*/*/Verb">Delete</translate>
<p slot="modal-header"> <p slot="modal-header" v-translate="{playlist: playlist.name}" translate-context="Popup/Playlist/Title/Call to action" :translate-params="{playlist: playlist.name}">
<translate :translate-params="{playlist: playlist.name}" translate-context="Popup/Playlist/Title/Call to action">Do you want to delete the playlist "%{ playlist }"?</translate> Do you want to delete the playlist "%{ playlist }"?
</p> </p>
<p slot="modal-content"><translate translate-context="Popup/Playlist/Paragraph">This will completely delete this playlist and cannot be undone.</translate></p> <p slot="modal-content"><translate translate-context="Popup/Playlist/Paragraph">This will completely delete this playlist and cannot be undone.</translate></p>
<div slot="modal-confirm"><translate translate-context="Popup/Playlist/Button.Label/Verb">Delete playlist</translate></div> <div slot="modal-confirm"><translate translate-context="Popup/Playlist/Button.Label/Verb">Delete playlist</translate></div>

4
front/src/views/radios/Detail.vue
View File

@ -24,9 +24,9 @@
</router-link> </router-link>
<dangerous-button class="labeled icon" :action="deleteRadio"> <dangerous-button class="labeled icon" :action="deleteRadio">
<i class="trash icon"></i> Delete <i class="trash icon"></i> Delete
<p slot="modal-header"><translate translate-context="Popup/Radio/Title" :translate-params="{radio: radio.name}">Do you want to delete the radio "%{ radio }"?</translate></p> <p slot="modal-header" v-translate="{radio: radio.name}" translate-context="Popup/Radio/Title" :translate-params="{radio: radio.name}">Do you want to delete the radio "%{ radio }"?</p>
<p slot="modal-content"><translate translate-context="Popup/Radio/Paragraph">This will completely delete this radio and cannot be undone.</translate></p> <p slot="modal-content"><translate translate-context="Popup/Radio/Paragraph">This will completely delete this radio and cannot be undone.</translate></p>
<div slot="modal-confirm"><translate translate-context="Popup/Radio/Button.Label/Verb">Delete radio</translate></div> <p slot="modal-confirm"><translate translate-context="Popup/Radio/Button.Label/Verb">Delete radio</translate></p>
</dangerous-button> </dangerous-button>
</template> </template>
</div> </div>