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

Merge branch '1035-end-edition-is-not-the-right-phrase' into 'develop' 

Resolve ""End edition" is not the right phrase"

Closes #1035

See merge request funkwhale/funkwhale!1047
This commit is contained in:
Eliot Berriot 2020-03-04 17:19:10 +01:00
parent ecc3ed3ac3 8c0d16821c
commit 3f8cc1385b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/users/playlists.rst
View File

@ -41,7 +41,7 @@ To add the currently playing song to a playlist:
- On the player at the bottom left of the screen, select the list icon to bring up the playlists pop-up - On the player at the bottom left of the screen, select the list icon to bring up the playlists pop-up
- Find the playlist you would like to add the song to and click "Add track" - Find the playlist you would like to add the song to and click "Add track"
- The changes will be saved automatically. Click "End Edition" to stop editing the playlist - The changes will be saved automatically. Click "Stop Editing" to stop editing the playlist
Add Music From Library Add Music From Library
^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -51,7 +51,7 @@ To add tracks from anywhere in Funkwhale:
- Search for the song or album you want to add to the playlist in the Search menu - Search for the song or album you want to add to the playlist in the Search menu
- Next to the song in question, you will see a list icon. Click on this to bring up the playlists pop-up - Next to the song in question, you will see a list icon. Click on this to bring up the playlists pop-up
- Find the playlist you would like to add the song to - Find the playlist you would like to add the song to
- The changes will be saved automatically. Click "End Edition" to stop editing the playlist - The changes will be saved automatically. Click "Stop Editing" to stop editing the playlist
Add Music From Queue Add Music From Queue
^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^
@ -63,7 +63,7 @@ To store the music that is currently in your queue:
- Click on the playlist you want to add your content to - Click on the playlist you want to add your content to
- In the window that appears, select "Edit" to start a new edition - In the window that appears, select "Edit" to start a new edition
- In the "Playlist editor" that appears, select "Insert from Queue" to add all content - In the "Playlist editor" that appears, select "Insert from Queue" to add all content
- The changes will be saved automatically. Click "End Edition" to stop editing the playlist - The changes will be saved automatically. Click "Stop Editing" to stop editing the playlist
Edit Playlist Contents Edit Playlist Contents
---------------------- ----------------------
@ -79,7 +79,7 @@ To remove a song or songs from a playlist:
- In the window that appears, select "Edit" to start a new edition - In the window that appears, select "Edit" to start a new edition
- For any track you want to remove, click on the red trash can icon on the right-hand side - For any track you want to remove, click on the red trash can icon on the right-hand side
- To remove all tracks at once, click "Clear Playlist" - To remove all tracks at once, click "Clear Playlist"
- The changes will save automatically. Click "End Edition" to stop editing the playlist - The changes will save automatically. Click "Stop Editing" to stop editing the playlist
Reorder Music in a Playlist Reorder Music in a Playlist
^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -91,7 +91,7 @@ To change the order of songs in a playlist:
- Click on the playlist you want to reorder - Click on the playlist you want to reorder
- In the window that appears, select "Edit" to start a new edition - In the window that appears, select "Edit" to start a new edition
- Drag the songs into the new order you want to store them in - Drag the songs into the new order you want to store them in
- The changes will save automatically. Click "End Edition" to stop editing the playlist - The changes will save automatically. Click "Stop Editing" to stop editing the playlist
Edit Playlist Settings Edit Playlist Settings
---------------------- ----------------------
@ -104,7 +104,7 @@ If you want to change the name or visibility of a playlist, you will need to edi
- In the window that appears, select "Edit" to start a new edition - In the window that appears, select "Edit" to start a new edition
- Change the "Playlist name" or "Playlist visibility" to their new values - Change the "Playlist name" or "Playlist visibility" to their new values
- Click "Update playlist" to commit your changes - Click "Update playlist" to commit your changes
- Click "End Edition" to stop editing the playlist - Click "Stop Editing" to stop editing the playlist
Delete a Playlist Delete a Playlist
----------------- -----------------

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

@ -28,7 +28,7 @@
v-if="$store.state.auth.profile && playlist.user.id === $store.state.auth.profile.id" v-if="$store.state.auth.profile && playlist.user.id === $store.state.auth.profile.id"
@click="edit = !edit"> @click="edit = !edit">
<i class="pencil icon"></i> <i class="pencil icon"></i>
<template v-if="edit"><translate translate-context="Content/Playlist/Button.Label/Verb">End edition</translate></template> <template v-if="edit"><translate translate-context="Content/Playlist/Button.Label/Verb">Stop Editing</translate></template>
<template v-else><translate translate-context="Content/*/Button.Label/Verb">Edit</translate></template> <template v-else><translate translate-context="Content/*/Button.Label/Verb">Edit</translate></template>
</button> </button>
<button <button