From 3583770084917933a42a987baf5cea793888de32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= Date: Fri, 6 Jul 2018 16:06:14 +0200 Subject: [PATCH 1/3] Fix some typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- front/src/views/admin/users/UsersDetail.vue | 2 +- front/src/views/federation/LibraryDetail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/views/admin/users/UsersDetail.vue b/front/src/views/admin/users/UsersDetail.vue index 72efabd89..4e750cafa 100644 --- a/front/src/views/admin/users/UsersDetail.vue +++ b/front/src/views/admin/users/UsersDetail.vue @@ -143,7 +143,7 @@ export default { computed: { labels () { return { - inactive: this.$gettext('Determine if the user account is active or not. Inactive users cannot login or user the service.') + inactive: this.$gettext('Determine if the user account is active or not. Inactive users cannot login or use the service.') } }, allPermissions () { diff --git a/front/src/views/federation/LibraryDetail.vue b/front/src/views/federation/LibraryDetail.vue index 4ddccb79b..708156c19 100644 --- a/front/src/views/federation/LibraryDetail.vue +++ b/front/src/views/federation/LibraryDetail.vue @@ -93,7 +93,7 @@ From 2a9ca0a2820b9472d0813cd99ce717554d4edaa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= Date: Fri, 6 Jul 2018 16:14:18 +0200 Subject: [PATCH 2/3] Fix another typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- front/src/components/auth/Settings.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/src/components/auth/Settings.vue b/front/src/components/auth/Settings.vue index 5a74b8888..2ccd70a70 100644 --- a/front/src/components/auth/Settings.vue +++ b/front/src/components/auth/Settings.vue @@ -48,12 +48,12 @@
- +
- +

Changing your password will have the following consequences

    -
  • You will be logged out from this session and have to log out with the new one
  • +
  • You will be logged out from this session and have to log in with the new one
  • Your Subsonic password will be changed to a new, random one, logging you out from devices that used the old Subsonic password
From 6e709cdcd8414b7f703a5e25adbdefb10feff065 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Fri, 6 Jul 2018 20:44:47 +0200 Subject: [PATCH 3/3] Removed non-breaking spaces and remaining gettext in templates --- CHANGELOG | 2 +- .../common/management/commands/script.py | 2 +- api/funkwhale_api/federation/signing.py | 2 +- docs/importing-music.rst | 4 ++-- front/src/App.vue | 4 ++-- front/src/components/Sidebar.vue | 2 +- front/src/components/audio/track/Table.vue | 16 ++++++++-------- front/src/components/auth/Login.vue | 6 +++--- front/src/components/auth/Profile.vue | 2 +- front/src/components/auth/Settings.vue | 4 ++-- .../components/federation/LibraryFollowTable.vue | 8 ++++---- front/src/components/library/import/Main.vue | 2 +- .../components/manage/library/RequestsTable.vue | 8 ++++---- .../components/manage/users/InvitationsTable.vue | 2 +- front/src/components/manage/users/UsersTable.vue | 8 ++++---- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3c26a5e92..6ec368a6c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1346,7 +1346,7 @@ Basic transcoding is now available to/from the following formats : ogg and mp3. This relies internally on FFMPEG and can put some load on your server. It's definitely recommended you setup some caching for the transcoded files -at your webserver level. Check the the exemple nginx file at deploy/nginx.conf +at your webserver level. Check the the exemple nginx file at deploy/nginx.conf for an implementation. On the frontend, usage of transcoding should be transparent in the player. diff --git a/api/funkwhale_api/common/management/commands/script.py b/api/funkwhale_api/common/management/commands/script.py index b46a4327b..cbfc78f0f 100644 --- a/api/funkwhale_api/common/management/commands/script.py +++ b/api/funkwhale_api/common/management/commands/script.py @@ -50,7 +50,7 @@ class Command(BaseCommand): self.stdout.write(self.style.SUCCESS(name)) self.stdout.write("") for line in script["help"].splitlines(): - self.stdout.write("     {}".format(line)) + self.stdout.write(" {}".format(line)) self.stdout.write("") def get_scripts(self): diff --git a/api/funkwhale_api/federation/signing.py b/api/funkwhale_api/federation/signing.py index 5b74b8577..1bb2b9d5d 100644 --- a/api/funkwhale_api/federation/signing.py +++ b/api/funkwhale_api/federation/signing.py @@ -13,7 +13,7 @@ from . import exceptions, utils logger = logging.getLogger(__name__) -#  the request Date should be between now - 30s and now + 30s +# the request Date should be between now - 30s and now + 30s DATE_HEADER_VALID_FOR = 30 diff --git a/docs/importing-music.rst b/docs/importing-music.rst index 76f086045..4b4ea7c1d 100644 --- a/docs/importing-music.rst +++ b/docs/importing-music.rst @@ -98,14 +98,14 @@ directory is mounted as a volume as well:: volumes: - ./data/music:/music:ro - ./data/media:/app/funkwhale_api/media - # add your symlinked dirs here + # add your symlinked dirs here - /media/nfsshare:/media/nfsshare:ro api: volumes: - ./data/music:/music:ro - ./data/media:/app/funkwhale_api/media - # add your symlinked dirs here + # add your symlinked dirs here - /media/nfsshare:/media/nfsshare:ro diff --git a/front/src/App.vue b/front/src/App.vue index 8e1abae7f..11ef9f13d 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -9,7 +9,7 @@ -

{{ $gettext('Suggested choices') }}

+

Suggested choices

{{ url }} @@ -61,7 +61,7 @@

Options

- + diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index beced0b44..2c193fc6e 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -47,7 +47,7 @@
Music
- +
- +
- {{ $gettext('Actor') }} - {{ $gettext('Creation date') }} - {{ $gettext('Status') }} - {{ $gettext('Actions') }} + Actor + Creation date + Status + Actions diff --git a/front/src/components/library/import/Main.vue b/front/src/components/library/import/Main.vue index e7d9d7d3d..08047fd2f 100644 --- a/front/src/components/library/import/Main.vue +++ b/front/src/components/library/import/Main.vue @@ -50,7 +50,7 @@ :class="['ui', 'positive', 'icon', {'disabled': !importBatch}, 'button']" :disabled="!importBatch" > - {{ $gettext('Finish import' )}} + Finish import
diff --git a/front/src/components/manage/library/RequestsTable.vue b/front/src/components/manage/library/RequestsTable.vue index be25c4bb4..da3d66363 100644 --- a/front/src/components/manage/library/RequestsTable.vue +++ b/front/src/components/manage/library/RequestsTable.vue @@ -69,24 +69,24 @@ {{ scope.obj.albums|truncate(30) }} - + {{ scope.obj.comment|truncate(30) }} - + - + {{ $gettext('Create import') }} + v-if="scope.obj.status === 'pending'">Create import diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue index 7d4864e87..9ebc07797 100644 --- a/front/src/components/manage/users/InvitationsTable.vue +++ b/front/src/components/manage/users/InvitationsTable.vue @@ -44,7 +44,7 @@