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

Merge branch '676-notification-encoding' into 'master' 

Fix #676: overescaping issue in notifications and album page

See merge request funkwhale/funkwhale!564
This commit is contained in:
Eliot Berriot 2019-01-26 13:16:30 +01:00
parent 22a38260e6 baa18bbdc7
commit ca433fd90e
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fixed overescaping issue in notifications and album page (#676)

12
front/src/components/library/Album.vue
View File

@ -10,13 +10,7 @@
<i class="circular inverted sound yellow icon"></i> <i class="circular inverted sound yellow icon"></i>
<div class="content"> <div class="content">
{{ album.title }} {{ album.title }}
<translate <div v-html="subtitle"></div>
tag="div"
translate-plural="Album containing %{ count } tracks, by %{ artist }"
:translate-n="album.tracks.length"
:translate-params="{count: album.tracks.length, artist: album.artist.name}">
Album containing %{ count } track, by %{ artist }
</translate>
</div> </div>
<div class="ui buttons"> <div class="ui buttons">
<router-link class="ui button" :to="{name: 'library.artists.detail', params: {id: album.artist.id }}"> <router-link class="ui button" :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
@ -184,6 +178,10 @@ export default {
this.$store.getters["instance/absoluteUrl"](this.album.cover.original) + this.$store.getters["instance/absoluteUrl"](this.album.cover.original) +
")" ")"
) )
},
subtitle () {
let msg = this.$ngettext('Album containing %{ count } track, by %{ artist }', 'Album containing %{ count } tracks, by %{ artist }', this.album.tracks.length)
return this.$gettextInterpolate(msg, {count: this.album.tracks.length, artist: this.album.artist.name})
} }
}, },
watch: { watch: {

6
front/src/components/notifications/NotificationRow.vue
View File

@ -4,10 +4,10 @@
<actor-link class="user" :actor="item.activity.actor" /> <actor-link class="user" :actor="item.activity.actor" />
</td> </td>
<td> <td>
<router-link tag="span" class="link" v-if="notificationData.detailUrl" :to="notificationData.detailUrl"> <router-link tag="span" class="link" v-if="notificationData.detailUrl" :to="notificationData.detailUrl" v-html="notificationData.message">
{{ notificationData.message }}
</router-link> </router-link>
<template v-else>{{ notificationData.message }}</template> <template v-else v-html="notificationData.message"></template>
<template v-if="notificationData.action">&nbsp; <template v-if="notificationData.action">&nbsp;
<div @click="handleAction(notificationData.action.handler)" :class="['ui', 'basic', 'tiny', notificationData.action.buttonClass || '', 'button']"> <div @click="handleAction(notificationData.action.handler)" :class="['ui', 'basic', 'tiny', notificationData.action.buttonClass || '', 'button']">
<i v-if="notificationData.action.icon" :class="[notificationData.action.icon, 'icon']" /> <i v-if="notificationData.action.icon" :class="[notificationData.action.icon, 'icon']" />