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

Merge branch '662-playlist-detail' into 'develop' 

Added i18n string context

See merge request funkwhale/funkwhale!589
This commit is contained in:
Eliot Berriot 2019-02-11 09:41:48 +01:00
parent 177ad95bee 6e16de27bc
commit 9a68304344
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.rst
View File

@ -432,7 +432,7 @@ This hierarchical structure is made of several parts:
- ``Content`` - ``Content``
- ``Footer`` - ``Footer``
- ``Menu`` - ``Menu``
- ``Modal`` - ``Popup``
- ``Sidebar`` - ``Sidebar``
- ``Head`` - ``Head``
- ``Popup`` - ``Popup``
@ -492,7 +492,7 @@ Here are a few examples of valid context hierarchies:
- ``Content/Home/Button/Call to action`` - ``Content/Home/Button/Call to action``
- ``Footer/*/Help text`` - ``Footer/*/Help text``
- ``*/*/*/Verb, Short`` - ``*/*/*/Verb, Short``
- ``Modal/Playlist/Button`` - ``Popup/Playlist/Button``
It's possible to nest multiple component parts to reach a higher level of detail. The component parts are then separated by a dot: It's possible to nest multiple component parts to reach a higher level of detail. The component parts are then separated by a dot:

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

@ -13,7 +13,8 @@
<translate <translate
translate-plural="Playlist containing %{ count } tracks, by %{ username }" translate-plural="Playlist containing %{ count } tracks, by %{ username }"
:translate-n="playlist.tracks_count" :translate-n="playlist.tracks_count"
:translate-params="{count: playlist.tracks_count, username: playlist.user.username}"> :translate-params="{count: playlist.tracks_count, username: playlist.user.username}"
:translate-context="'Content/Playlist/Header.Subtitle'">
Playlist containing %{ count } track, by %{ username } Playlist containing %{ count } track, by %{ username }
</translate><br> </translate><br>
<duration :seconds="playlist.duration" /> <duration :seconds="playlist.duration" />
@ -21,22 +22,22 @@
</div> </div>
</h2> </h2>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<play-button class="orange" :is-playable="playlist.is_playable" :tracks="tracks"><translate>Play all</translate></play-button> <play-button class="orange" :is-playable="playlist.is_playable" :tracks="tracks"><translate :translate-context="'Content/*/Button.Label/Verb, Short'">Play all</translate></play-button>
<button <button
class="ui icon button" class="ui icon button"
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>End edition</translate></template> <template v-if="edit"><translate :translate-context="'Content/Playlist/Button.Label/Verb'">End edition</translate></template>
<template v-else><translate>Edit…</translate></template> <template v-else><translate :translate-context="'Content/*/Button.Label/Verb'">Edit…</translate></template>
</button> </button>
<dangerous-button v-if="$store.state.auth.profile && playlist.user.id === $store.state.auth.profile.id" class="labeled icon" :action="deletePlaylist"> <dangerous-button v-if="$store.state.auth.profile && playlist.user.id === $store.state.auth.profile.id" class="labeled icon" :action="deletePlaylist">
<i class="trash icon"></i> <translate>Delete</translate> <i class="trash icon"></i> <translate :translate-context="'Content/*/Button.Label/Verb'">Delete</translate>
<p slot="modal-header"> <p slot="modal-header">
<translate :translate-params="{playlist: playlist.name}">Do you want to delete the playlist "%{ playlist }"?</translate> <translate :translate-params="{playlist: playlist.name}" :translate-context="'Popup/Playlist/Title/Call to action'">Do you want to delete the playlist "%{ playlist }"?</translate>
</p> </p>
<p slot="modal-content"><translate>This will completely delete this playlist and cannot be undone.</translate></p> <p slot="modal-content"><translate :translate-context="'Popup/Playlist/Paragraph'">This will completely delete this playlist and cannot be undone.</translate></p>
<p slot="modal-confirm"><translate>Delete playlist</translate></p> <p slot="modal-confirm"><translate :translate-context="'Popup/Playlist/Button.Label/Verb'">Delete playlist</translate></p>
</dangerous-button> </dangerous-button>
</div> </div>
</section> </section>
@ -48,7 +49,7 @@
:playlist="playlist" :playlist-tracks="playlistTracks"></playlist-editor> :playlist="playlist" :playlist-tracks="playlistTracks"></playlist-editor>
</template> </template>
<template v-else> <template v-else>
<h2><translate>Tracks</translate></h2> <h2><translate :translate-context="'Content/*/Title/Name'">Tracks</translate></h2>
<track-table :display-position="true" :tracks="tracks"></track-table> <track-table :display-position="true" :tracks="tracks"></track-table>
</template> </template>
</section> </section>
@ -87,7 +88,7 @@ export default {
computed: { computed: {
labels() { labels() {
return { return {
playlist: this.$gettext("Playlist") playlist: this.$gettext('Playlist')
} }
} }
}, },