diff --git a/front/src/components/favorites/List.vue b/front/src/components/favorites/List.vue index eacea63eca01e52b3b96b22d541cac8e6ac623a2..f178e41b38523558e17d25317a6d2d9eeb0fc9b6 100644 --- a/front/src/components/favorites/List.vue +++ b/front/src/components/favorites/List.vue @@ -24,7 +24,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -69,10 +69,11 @@ import RadioButton from '@/components/radios/Button' import Pagination from '@/components/Pagination' import OrderingMixin from '@/components/mixins/Ordering' import PaginationMixin from '@/components/mixins/Pagination' +import TranslationsMixin from '@/components/mixins/Translations' const FAVORITES_URL = 'tracks/' export default { - mixins: [OrderingMixin, PaginationMixin], + mixins: [OrderingMixin, PaginationMixin, TranslationsMixin], components: { TrackTable, RadioButton, @@ -90,10 +91,10 @@ export default { orderingDirection: defaultOrdering.direction || '+', ordering: defaultOrdering.field, orderingOptions: [ - ['creation_date', 'Creation date'], - ['title', 'Track name'], - ['album__title', 'Album name'], - ['artist__name', 'Artist name'] + ['creation_date', 'creation_date'], + ['title', 'track_title'], + ['album__title', 'album_title'], + ['artist__name', 'artist_name'] ] } }, diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue index 2ced8c64345840a90c38b0388732bddcd3743366..379d07e4b8bccd72838effeb99d8d42f0d37c8ac 100644 --- a/front/src/components/library/Artists.vue +++ b/front/src/components/library/Artists.vue @@ -16,7 +16,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -77,13 +77,14 @@ import logger from '@/logging' import OrderingMixin from '@/components/mixins/Ordering' import PaginationMixin from '@/components/mixins/Pagination' +import TranslationsMixin from '@/components/mixins/Translations' import ArtistCard from '@/components/audio/artist/Card' import Pagination from '@/components/Pagination' const FETCH_URL = 'artists/' export default { - mixins: [OrderingMixin, PaginationMixin], + mixins: [OrderingMixin, PaginationMixin, TranslationsMixin], props: { defaultQuery: {type: String, required: false, default: ''} }, @@ -102,8 +103,8 @@ export default { orderingDirection: defaultOrdering.direction || '+', ordering: defaultOrdering.field, orderingOptions: [ - ['creation_date', 'Creation date'], - ['name', 'Name'] + ['creation_date', 'creation_date'], + ['name', 'name'] ] } }, diff --git a/front/src/components/library/Radios.vue b/front/src/components/library/Radios.vue index 2b542a71bef62ed5bd9f958bf4d535a297b7eae3..4cc1d58df1286509747129b2fe31fde5eb22a291 100644 --- a/front/src/components/library/Radios.vue +++ b/front/src/components/library/Radios.vue @@ -34,7 +34,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -99,13 +99,14 @@ import logger from '@/logging' import OrderingMixin from '@/components/mixins/Ordering' import PaginationMixin from '@/components/mixins/Pagination' +import TranslationsMixin from '@/components/mixins/Translations' import RadioCard from '@/components/radios/Card' import Pagination from '@/components/Pagination' const FETCH_URL = 'radios/radios/' export default { - mixins: [OrderingMixin, PaginationMixin], + mixins: [OrderingMixin, PaginationMixin, TranslationsMixin], props: { defaultQuery: {type: String, required: false, default: ''} }, @@ -124,8 +125,8 @@ export default { orderingDirection: defaultOrdering.direction || '+', ordering: defaultOrdering.field, orderingOptions: [ - ['creation_date', 'Creation date'], - ['name', 'Name'] + ['creation_date', 'creation_date'], + ['name', 'name'] ] } }, diff --git a/front/src/components/manage/library/FilesTable.vue b/front/src/components/manage/library/FilesTable.vue index f143247a2fb85b3d48ba89555c7c9b7683faa08f..1f5fc397640ccc59e2e62bb38926c500f5872d01 100644 --- a/front/src/components/manage/library/FilesTable.vue +++ b/front/src/components/manage/library/FilesTable.vue @@ -10,7 +10,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -111,9 +111,10 @@ import time from '@/utils/time' import Pagination from '@/components/Pagination' import ActionTable from '@/components/common/ActionTable' import OrderingMixin from '@/components/mixins/Ordering' +import TranslationsMixin from '@/components/mixins/Translations' export default { - mixins: [OrderingMixin], + mixins: [OrderingMixin, TranslationsMixin], props: { filters: {type: Object, required: false} }, @@ -133,12 +134,12 @@ export default { orderingDirection: defaultOrdering.direction || '+', ordering: defaultOrdering.field, orderingOptions: [ - ['creation_date', 'Creation date'], - ['accessed_date', 'Accessed date'], - ['modification_date', 'Modification date'], - ['size', 'Size'], - ['bitrate', 'Bitrate'], - ['duration', 'Duration'] + ['creation_date', 'creation_date'], + ['accessed_date', 'accessed_date'], + ['modification_date', 'modification_date'], + ['size', 'size'], + ['bitrate', 'bitrate'], + ['duration', 'duration'] ] } diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue index 02a889be17679e95e05ed94ec925f9057e24914d..d697c3821d7a7b019fcb9e12c3ba01d6401f7834 100644 --- a/front/src/components/manage/users/InvitationsTable.vue +++ b/front/src/components/manage/users/InvitationsTable.vue @@ -10,7 +10,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -90,9 +90,10 @@ import _ from 'lodash' import Pagination from '@/components/Pagination' import ActionTable from '@/components/common/ActionTable' import OrderingMixin from '@/components/mixins/Ordering' +import TranslationsMixin from '@/components/mixins/Translations' export default { - mixins: [OrderingMixin], + mixins: [OrderingMixin, TranslationsMixin], props: { filters: {type: Object, required: false} }, @@ -113,8 +114,8 @@ export default { orderingDirection: defaultOrdering.direction || '+', ordering: defaultOrdering.field, orderingOptions: [ - ['expiration_date', 'Expiration date'], - ['creation_date', 'Creation date'] + ['expiration_date', 'expiration_date'], + ['creation_date', 'creation_date'] ] } diff --git a/front/src/components/manage/users/UsersTable.vue b/front/src/components/manage/users/UsersTable.vue index ce081278ba7724f0f89b67b7720ee9ee4b297552..cb46ed811fbdcb228b8de252f949f40f44fd2d10 100644 --- a/front/src/components/manage/users/UsersTable.vue +++ b/front/src/components/manage/users/UsersTable.vue @@ -10,7 +10,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -101,9 +101,10 @@ import time from '@/utils/time' import Pagination from '@/components/Pagination' import ActionTable from '@/components/common/ActionTable' import OrderingMixin from '@/components/mixins/Ordering' +import TranslationsMixin from '@/components/mixins/Translations' export default { - mixins: [OrderingMixin], + mixins: [OrderingMixin, TranslationsMixin], props: { filters: {type: Object, required: false} }, @@ -123,9 +124,9 @@ export default { orderingDirection: defaultOrdering.direction || '+', ordering: defaultOrdering.field, orderingOptions: [ - ['date_joined', 'Sign-up date'], - ['last_activity', 'Last activity'], - ['username', 'Username'] + ['date_joined', 'date_joined'], + ['last_activity', 'last_activity'], + ['username', 'username'] ] } diff --git a/front/src/views/content/libraries/FilesTable.vue b/front/src/views/content/libraries/FilesTable.vue index ef34b3983242f31ad6edf772b852ae527abe3f4f..21ad79e7200ae5776b995087bdbd897a545af847 100644 --- a/front/src/views/content/libraries/FilesTable.vue +++ b/front/src/views/content/libraries/FilesTable.vue @@ -22,7 +22,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -127,9 +127,10 @@ import {normalizeQuery, parseTokens, compileTokens} from '@/search' import Pagination from '@/components/Pagination' import ActionTable from '@/components/common/ActionTable' import OrderingMixin from '@/components/mixins/Ordering' +import TranslationsMixin from '@/components/mixins/Translations' export default { - mixins: [OrderingMixin], + mixins: [OrderingMixin, TranslationsMixin], props: { filters: {type: Object, required: false}, defaultQuery: {type: String, default: ''}, @@ -153,13 +154,13 @@ export default { orderingDirection: '-', ordering: 'creation_date', orderingOptions: [ - ['creation_date', 'Creation date'], - ['title', 'Title'], - ['size', 'Size'], - ['duration', 'Duration'], - ['bitrate', 'Bitrate'], - ['album_title', 'Album title'], - ['artist_name', 'Artist name'] + ['creation_date', 'creation_date'], + ['title', 'title'], + ['size', 'size'], + ['duration', 'duration'], + ['bitrate', 'bitrate'], + ['album_title', 'album_title'], + ['artist_name', 'artist_name'] ] } }, diff --git a/front/src/views/playlists/List.vue b/front/src/views/playlists/List.vue index a831dfe7035ca033fd24a20e807ab289d011c5dd..47035da7fc6df7ce15fe993559071d9dbf8b2069 100644 --- a/front/src/views/playlists/List.vue +++ b/front/src/views/playlists/List.vue @@ -18,7 +18,7 @@ <label><translate>Ordering</translate></label> <select class="ui dropdown" v-model="ordering"> <option v-for="option in orderingOptions" :value="option[0]"> - {{ option[1] }} + {{ sharedLabels.filters[option[1]] }} </option> </select> </div> @@ -61,13 +61,14 @@ import $ from 'jquery' import OrderingMixin from '@/components/mixins/Ordering' import PaginationMixin from '@/components/mixins/Pagination' +import TranslationsMixin from '@/components/mixins/Translations' import PlaylistCardList from '@/components/playlists/CardList' import Pagination from '@/components/Pagination' const FETCH_URL = 'playlists/' export default { - mixins: [OrderingMixin, PaginationMixin], + mixins: [OrderingMixin, PaginationMixin, TranslationsMixin], props: { defaultQuery: {type: String, required: false, default: ''} }, @@ -86,9 +87,9 @@ export default { orderingDirection: defaultOrdering.direction || '+', ordering: defaultOrdering.field, orderingOptions: [ - ['creation_date', 'Creation date'], - ['modification_date', 'Last modification date'], - ['name', 'Name'] + ['creation_date', 'creation_date'], + ['modification_date', 'modification_date'], + ['name', 'name'] ] } },