Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jovuit
funkwhale_OLD
Commits
240a17df
Commit
240a17df
authored
Jul 27, 2018
by
Eliot Berriot
Browse files
Merge branch 'minor-fixes' into 'develop'
Minor fixes See merge request
funkwhale/funkwhale!361
parents
b17ab1eb
ec52aa04
Changes
2
Hide whitespace changes
Inline
Side-by-side
front/src/components/audio/PlayButton.vue
View file @
240a17df
...
...
@@ -110,7 +110,7 @@ export default {
resolve
(
self
.
tracks
)
}
else
if
(
self
.
playlist
)
{
let
url
=
'
playlists/
'
+
self
.
playlist
.
id
+
'
/
'
axios
.
get
(
url
+
'
tracks
'
).
then
((
response
)
=>
{
axios
.
get
(
url
+
'
tracks
/
'
).
then
((
response
)
=>
{
resolve
(
response
.
data
.
results
.
map
(
plt
=>
{
return
plt
.
track
}))
...
...
front/src/main.js
View file @
240a17df
...
...
@@ -43,6 +43,10 @@ if (availableLanguages[store.state.ui.currentLanguage]) {
Vue
.
use
(
GetTextPlugin
,
{
availableLanguages
:
availableLanguages
,
defaultLanguage
:
defaultLanguage
,
// cf https://github.com/Polyconseil/vue-gettext#configuration
// not recommended but this is fixing weird bugs with translation nodes
// not being updated when in v-if/v-else clauses
autoAddKeyAttributes
:
true
,
languageVmMixin
:
{
computed
:
{
currentKebabCase
:
function
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment