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

Merge branch '435-title-playbutton' into 'develop' 

Resolve "Wrong titles on play button"

Closes #435

See merge request funkwhale/funkwhale!398
This commit is contained in:
Eliot Berriot 2018-09-06 17:39:38 +00:00
parent 4401b868a2 209b485426
commit b0ca181016
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fixed wrong title in PlayButton (#435)

12
front/src/components/audio/PlayButton.vue
View File

@ -2,7 +2,7 @@
<span :title="title" :class="['ui', {'tiny': discrete}, {'buttons': !dropdownOnly && !iconOnly}]">
<button
v-if="!dropdownOnly"
:title="labels.addToQueue"
:title="labels.playNow"
@click="addNext(true)"
:disabled="!playable"
:class="buttonClasses.concat(['ui', {loading: isLoading}, {'mini': discrete}, {disabled: !playable}])">
@ -12,9 +12,9 @@
<div v-if="!discrete && !iconOnly" :class="['ui', {disabled: !playable}, 'floating', 'dropdown', {'icon': !dropdownOnly}, {'button': !dropdownOnly}]">
<i :class="dropdownIconClasses.concat(['icon'])"></i>
<div class="menu">
<div class="item" :disabled="!playable" @click="add"><i class="plus icon"></i><translate>Add to queue</translate></div>
<div class="item" :disabled="!playable" @click="addNext()"><i class="step forward icon"></i><translate>Play next</translate></div>
<div class="item" :disabled="!playable" @click="addNext(true)"><i class="arrow down icon"></i><translate>Play now</translate></div>
<div class="item" :disabled="!playable" @click="add" :title="labels.addToQueue"><i class="plus icon"></i><translate>Add to queue</translate></div>
<div class="item" :disabled="!playable" @click="addNext()" :title="labels.playNext"><i class="step forward icon"></i><translate>Play next</translate></div>
<div class="item" :disabled="!playable" @click="addNext(true)" :title="labels.playNow"><i class="arrow down icon"></i><translate>Play now</translate></div>
</div>
</div>
</span>
@ -50,7 +50,9 @@ export default {
computed: {
labels () {
return {
addToQueue: this.$gettext('Add to current queue')
playNow: this.$gettext('Play now'),
addToQueue: this.$gettext('Add to current queue'),
playNext: this.$gettext('Play next')
}
},
title () {