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

#662: Corrected wrong terminology in string context

See merge request funkwhale/funkwhale!600
merge-requests/622/head
Eliot Berriot 2019-02-11 09:42:54 +01:00
commit 44ddb736b2
2 zmienionych plików z 6 dodań i 5 usunięć

Wyświetl plik

@ -484,6 +484,7 @@ This hierarchical structure is made of several parts:
The detail part, which is optional and refers to the contents of the string itself, such as:
- ``Call to action``
- ``Verb``
- ``Noun``
- ``Short``
- ``Unit``

Wyświetl plik

@ -11,11 +11,11 @@
</template>
<div class="fields">
<div class="field">
<label><translate :translate-context="'Content/*/Form.Label/Short, Name'">Search</translate></label>
<label><translate :translate-context="'Content/*/Form.Label/Short, Noun'">Search</translate></label>
<input type="text" name="search" v-model="query" :placeholder="labels.searchPlaceholder"/>
</div>
<div class="field">
<label><translate :translate-context="'Content/*/Dropdown.Label/Short, Name'">Ordering</translate></label>
<label><translate :translate-context="'Content/*/Dropdown.Label/Short, Noun'">Ordering</translate></label>
<select class="ui dropdown" v-model="ordering">
<option v-for="option in orderingOptions" :value="option[0]">
{{ sharedLabels.filters[option[1]] }}
@ -23,14 +23,14 @@
</select>
</div>
<div class="field">
<label><translate :translate-context="'Content/*/Dropdown.Label/Short, Name'">Order</translate></label>
<label><translate :translate-context="'Content/*/Dropdown.Label/Short, Noun'">Order</translate></label>
<select class="ui dropdown" v-model="orderingDirection">
<option value="+"><translate :translate-context="'Content/*/Dropdown/Short'">Ascending</translate></option>
<option value="-"><translate :translate-context="'Content/*/Dropdown/Short'">Descending</translate></option>
</select>
</div>
<div class="field">
<label><translate :translate-context="'Content/*/Dropdown.Label/Short, Name'">Results per page</translate></label>
<label><translate :translate-context="'Content/*/Dropdown.Label/Short, Noun'">Results per page</translate></label>
<select class="ui dropdown" v-model="paginateBy">
<option :value="parseInt(12)">12</option>
<option :value="parseInt(25)">25</option>
@ -103,7 +103,7 @@ export default {
},
computed: {
labels() {
let playlists = this.$pgettext('Head/Playlist/Title/Name', 'Playlists')
let playlists = this.$pgettext('Head/Playlist/Title/Noun', 'Playlists')
let searchPlaceholder = this.$pgettext('Content/Playlist/Placeholder/Call to action', 'Enter playlist name…')
return {
playlists,