Commit b0ca1810 authored by Eliot Berriot's avatar Eliot Berriot

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

Resolve "Wrong titles on play button"

Closes #435

See merge request funkwhale/funkwhale!398
parents 4401b868 209b4854
Fixed wrong title in PlayButton (#435)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<span :title="title" :class="['ui', {'tiny': discrete}, {'buttons': !dropdownOnly && !iconOnly}]"> <span :title="title" :class="['ui', {'tiny': discrete}, {'buttons': !dropdownOnly && !iconOnly}]">
<button <button
v-if="!dropdownOnly" v-if="!dropdownOnly"
:title="labels.addToQueue" :title="labels.playNow"
@click="addNext(true)" @click="addNext(true)"
:disabled="!playable" :disabled="!playable"
:class="buttonClasses.concat(['ui', {loading: isLoading}, {'mini': discrete}, {disabled: !playable}])"> :class="buttonClasses.concat(['ui', {loading: isLoading}, {'mini': discrete}, {disabled: !playable}])">
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<div v-if="!discrete && !iconOnly" :class="['ui', {disabled: !playable}, 'floating', 'dropdown', {'icon': !dropdownOnly}, {'button': !dropdownOnly}]"> <div v-if="!discrete && !iconOnly" :class="['ui', {disabled: !playable}, 'floating', 'dropdown', {'icon': !dropdownOnly}, {'button': !dropdownOnly}]">
<i :class="dropdownIconClasses.concat(['icon'])"></i> <i :class="dropdownIconClasses.concat(['icon'])"></i>
<div class="menu"> <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="add" :title="labels.addToQueue"><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()" :title="labels.playNext"><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="addNext(true)" :title="labels.playNow"><i class="arrow down icon"></i><translate>Play now</translate></div>
</div> </div>
</div> </div>
</span> </span>
...@@ -50,7 +50,9 @@ export default { ...@@ -50,7 +50,9 @@ export default {
computed: { computed: {
labels () { labels () {
return { 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 () { title () {
......
Markdown is supported
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