From 96124aafd57976509bd520cd430fd469f48ceca1 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 30 Jun 2018 16:27:26 +0200
Subject: [PATCH] See #161: fixed weird extraction issues
---
front/src/components/audio/Player.vue | 3 ++-
.../federation/LibraryTrackTable.vue | 3 ++-
.../components/manage/library/FilesTable.vue | 3 ++-
.../manage/library/RequestsTable.vue | 10 +++++---
.../manage/users/InvitationsTable.vue | 3 ++-
front/src/views/admin/Settings.vue | 25 +++++++++++++------
6 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index 0a7930a5..37457df7 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -180,12 +180,13 @@ export default {
return
}
let self = this
+ let msg = this.$gettext('Queue shuffled!')
this.isShuffling = true
setTimeout(() => {
self.$store.dispatch('queue/shuffle', () => {
self.isShuffling = false
self.$store.commit('ui/addMessage', {
- content: self.$gettext('Queue shuffled!'),
+ content: msg,
date: new Date()
})
})
diff --git a/front/src/components/federation/LibraryTrackTable.vue b/front/src/components/federation/LibraryTrackTable.vue
index 9c2474a3..058c2137 100644
--- a/front/src/components/federation/LibraryTrackTable.vue
+++ b/front/src/components/federation/LibraryTrackTable.vue
@@ -156,10 +156,11 @@ export default {
}
},
actions () {
+ let msg = this.$gettext('Import')
return [
{
name: 'import',
- label: this.$gettext('Import'),
+ label: msg,
filterCheckable: (obj) => { return obj.status === 'not_imported' }
}
]
diff --git a/front/src/components/manage/library/FilesTable.vue b/front/src/components/manage/library/FilesTable.vue
index f7c94249..604c8fc3 100644
--- a/front/src/components/manage/library/FilesTable.vue
+++ b/front/src/components/manage/library/FilesTable.vue
@@ -181,10 +181,11 @@ export default {
}
},
actions () {
+ let msg = this.$gettext('Delete')
return [
{
name: 'delete',
- label: this.$gettext('Delete'),
+ label: msg,
isDangerous: true
}
]
diff --git a/front/src/components/manage/library/RequestsTable.vue b/front/src/components/manage/library/RequestsTable.vue
index 2a85d8b6..7707afbf 100644
--- a/front/src/components/manage/library/RequestsTable.vue
+++ b/front/src/components/manage/library/RequestsTable.vue
@@ -186,21 +186,25 @@ export default {
}
},
actions () {
+ // somehow, extraction fails otherwise
+ let deleteLabel = this.$gettext('Delete')
+ let markImportedLabel = this.$gettext('Mark as imported')
+ let markClosedLabel = this.$gettext('Mark as closed')
return [
{
name: 'delete',
- label: this.$gettext('Delete'),
+ label: deleteLabel,
isDangerous: true
},
{
name: 'mark_imported',
- label: this.$gettext('Mark as imported'),
+ label: markImportedLabel,
filterCheckable: (obj) => { return ['pending', 'accepted'].indexOf(obj.status) > -1 },
isDangerous: true
},
{
name: 'mark_closed',
- label: this.$gettext('Mark as closed'),
+ label: markClosedLabel,
filterCheckable: (obj) => { return ['pending', 'accepted'].indexOf(obj.status) > -1 },
isDangerous: true
}
diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue
index 8408eb5b..ce34ddbc 100644
--- a/front/src/components/manage/users/InvitationsTable.vue
+++ b/front/src/components/manage/users/InvitationsTable.vue
@@ -158,10 +158,11 @@ export default {
}
},
actions () {
+ let deleteLabel = this.$gettext('Delete')
return [
{
name: 'delete',
- label: this.$gettext('Delete'),
+ label: deleteLabel,
filterCheckable: (obj) => {
return obj.users.length === 0 && moment().isBefore(obj.expiration_date)
}
diff --git a/front/src/views/admin/Settings.vue b/front/src/views/admin/Settings.vue
index 9144a344..3690c92b 100644
--- a/front/src/views/admin/Settings.vue
+++ b/front/src/views/admin/Settings.vue
@@ -71,9 +71,18 @@ export default {
},
computed: {
groups () {
+ // somehow, extraction fails if in the return block directly
+ let instanceLabel = this.$gettext('Instance information')
+ let usersLabel = this.$gettext('Users')
+ let importsLabel = this.$gettext('Imports')
+ let playlistsLabel = this.$gettext('Playlists')
+ let federationLabel = this.$gettext('Federation')
+ let subsonicLabel = this.$gettext('Subsonic')
+ let statisticsLabel = this.$gettext('Statistics')
+ let errorLabel = this.$gettext('Error reporting')
return [
{
- label: this.$gettext('Instance information'),
+ label: instanceLabel,
id: 'instance',
settings: [
'instance__name',
@@ -82,7 +91,7 @@ export default {
]
},
{
- label: this.$gettext('Users'),
+ label: usersLabel,
id: 'users',
settings: [
'users__registration_enabled',
@@ -91,21 +100,21 @@ export default {
]
},
{
- label: this.$gettext('Imports'),
+ label: importsLabel,
id: 'imports',
settings: [
'providers_youtube__api_key'
]
},
{
- label: this.$gettext('Playlists'),
+ label: playlistsLabel,
id: 'playlists',
settings: [
'playlists__max_tracks'
]
},
{
- label: this.$gettext('Federation'),
+ label: federationLabel,
id: 'federation',
settings: [
'federation__enabled',
@@ -116,14 +125,14 @@ export default {
]
},
{
- label: this.$gettext('Subsonic'),
+ label: subsonicLabel,
id: 'subsonic',
settings: [
'subsonic__enabled'
]
},
{
- label: this.$gettext('Statistics'),
+ label: statisticsLabel,
id: 'statistics',
settings: [
'instance__nodeinfo_enabled',
@@ -132,7 +141,7 @@ export default {
]
},
{
- label: this.$gettext('Error reporting'),
+ label: errorLabel,
id: 'reporting',
settings: [
'raven__front_enabled',
--
GitLab