From 833c0f16258e1bf41ca9cd763fc6a67427eb5fb0 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 30 Jun 2018 15:28:47 +0200 Subject: [PATCH] WIP replace --- front/src/components/About.vue | 10 +-- front/src/components/Home.vue | 57 ++++++++------- front/src/components/PageNotFound.vue | 9 +-- front/src/components/Sidebar.vue | 70 +++++++++++-------- front/src/components/activity/Like.vue | 12 +--- front/src/components/activity/Listen.vue | 14 +--- front/src/components/admin/SettingsGroup.vue | 6 +- front/src/components/audio/PlayButton.vue | 17 ++--- front/src/components/audio/Player.vue | 26 +++---- front/src/components/audio/Search.vue | 10 +-- front/src/components/audio/album/Card.vue | 17 ++--- front/src/components/audio/artist/Card.vue | 12 ++-- front/src/components/audio/track/Table.vue | 22 +++--- front/src/components/auth/Login.vue | 20 +++--- front/src/components/auth/Logout.vue | 9 +-- front/src/components/auth/Profile.vue | 10 +-- front/src/components/auth/Settings.vue | 44 +++++++----- front/src/components/auth/Signup.vue | 20 +++--- .../src/components/auth/SubsonicTokenForm.vue | 36 +++++----- front/src/components/common/ActionTable.vue | 61 ++++++++++++---- .../src/components/common/DangerousButton.vue | 12 +++- front/src/components/discussion/Comment.vue | 12 ++-- front/src/components/favorites/List.vue | 23 +++--- .../favorites/TrackFavoriteIcon.vue | 8 +-- .../src/components/federation/LibraryCard.vue | 23 +++--- .../federation/LibraryFollowTable.vue | 70 +++++++++++-------- .../src/components/federation/LibraryForm.vue | 18 +++-- .../federation/LibraryTrackTable.vue | 42 ++++++----- front/src/components/forms/PasswordInput.vue | 2 +- front/src/components/instance/Stats.vue | 18 ++--- front/src/components/library/Album.vue | 31 +++++--- front/src/components/library/Artist.vue | 21 ++++-- front/src/components/library/Artists.vue | 14 ++-- front/src/components/library/Home.vue | 12 +++- front/src/components/library/Library.vue | 20 ++++-- front/src/components/library/Radios.vue | 22 +++--- front/src/components/library/Track.vue | 51 ++++++++------ .../library/import/ArtistImport.vue | 6 +- .../components/library/import/BatchDetail.vue | 47 +++++++------ .../components/library/import/BatchList.vue | 39 ++++++----- .../components/library/import/FileUpload.vue | 31 ++++---- front/src/components/library/import/Main.vue | 64 +++++++++++------ .../library/import/ReleaseImport.vue | 14 ++-- .../components/library/import/TrackImport.vue | 16 ++--- .../src/components/library/radios/Builder.vue | 46 +++++++----- .../src/components/library/radios/Filter.vue | 6 +- .../components/manage/library/FilesTable.vue | 37 +++++----- .../manage/library/RequestsTable.vue | 61 ++++++++-------- .../manage/users/InvitationForm.vue | 14 ++-- .../manage/users/InvitationsTable.vue | 35 +++++----- .../components/manage/users/UsersTable.vue | 51 +++++++------- front/src/components/metadata/ArtistCard.vue | 2 +- front/src/components/metadata/ReleaseCard.vue | 2 +- front/src/components/metadata/Search.vue | 8 +-- front/src/components/playlists/Card.vue | 11 +-- front/src/components/playlists/Editor.vue | 25 ++++--- front/src/components/playlists/Form.vue | 22 +++--- .../components/playlists/PlaylistModal.vue | 32 ++++----- .../playlists/TrackPlaylistIcon.vue | 4 +- front/src/components/radios/Button.vue | 4 +- front/src/components/radios/Card.vue | 2 +- front/src/components/requests/Card.vue | 2 +- front/src/components/requests/Form.vue | 18 ++--- front/src/main.js | 2 +- front/src/views/admin/Settings.vue | 20 +++--- front/src/views/admin/library/Base.vue | 6 +- front/src/views/admin/library/FilesList.vue | 2 +- .../src/views/admin/library/RequestsList.vue | 4 +- front/src/views/admin/users/Base.vue | 6 +- .../src/views/admin/users/InvitationsList.vue | 4 +- front/src/views/admin/users/UsersDetail.vue | 26 +++---- front/src/views/admin/users/UsersList.vue | 4 +- front/src/views/auth/EmailConfirm.vue | 18 ++--- front/src/views/auth/PasswordReset.vue | 16 ++--- front/src/views/auth/PasswordResetConfirm.vue | 20 +++--- front/src/views/federation/Base.vue | 8 +-- front/src/views/federation/LibraryDetail.vue | 39 ++++++----- .../views/federation/LibraryFollowersList.vue | 4 +- front/src/views/federation/LibraryList.vue | 16 ++--- .../src/views/federation/LibraryTrackList.vue | 2 +- front/src/views/instance/Timeline.vue | 4 +- front/src/views/playlists/Detail.vue | 33 +++++---- front/src/views/playlists/List.vue | 20 +++--- 83 files changed, 973 insertions(+), 761 deletions(-) diff --git a/front/src/components/About.vue b/front/src/components/About.vue index 59c8411ac..5ebed8102 100644 --- a/front/src/components/About.vue +++ b/front/src/components/About.vue @@ -3,21 +3,23 @@

- - + +

- {{ $t('Unfortunately, owners of this instance did not yet take the time to complete this page.') }} + {{ $gettext('Unfortunately, owners of this instance did not yet take the time to complete this page.') }}

- {{ $t('Edit instance info') }} + {{ $gettext('Edit instance info') }}

- {{ $t('Welcome on Funkwhale') }} + {{ $gettext('Welcome on Funkwhale') }}

-

{{ $t('We think listening to music should be simple.') }}

+

{{ $gettext('We think listening to music should be simple.') }}

- {{ $t('Learn more about this instance') }} + {{ $gettext('Learn more about this instance') }} - {{ $t('Get me to the library') }} + {{ $gettext('Get me to the library') }}
@@ -22,9 +22,9 @@

- {{ $t('Why funkwhale?') }} + {{ $gettext('Why funkwhale?') }}

-

{{ $t('That\'s simple: we loved Grooveshark and we want to build something even better.') }}

+

{{ $gettext('That\'s simple: we loved Grooveshark and we want to build something even better.') }}

@@ -35,26 +35,26 @@

- {{ $t('Unlimited music') }} + {{ $gettext('Unlimited music') }}

-

{{ $t('Funkwhale is designed to make it easy to listen to music you like, or to discover new artists.') }}

+

{{ $gettext('Funkwhale is designed to make it easy to listen to music you like, or to discover new artists.') }}

- {{ $t('Click once, listen for hours using built-in radios') }} + {{ $gettext('Click once, listen for hours using built-in radios') }}
- {{ $t('Keep a track of your favorite songs') }} + {{ $gettext('Keep a track of your favorite songs') }}
- {{ $t('Playlists? We got them') }} + {{ $gettext('Playlists? We got them') }}
@@ -62,28 +62,31 @@

- {{ $t('Clean library') }} + {{ $gettext('Clean library') }}

-

{{ $t('Funkwhale takes care of handling your music') }}.

+

{{ $gettext('Funkwhale takes care of handling your music') }}.

- {{ $t('Import music from various platforms, such as YouTube or SoundCloud') }} + {{ $gettext('Import music from various platforms, such as YouTube or SoundCloud') }}
- {{ $t('Covers, lyrics, our goal is to have them all ;)') }} + {{ $gettext('Covers, lyrics, our goal is to have them all ;)') }}
@@ -91,20 +94,20 @@

- {{ $t('Easy to use') }} + {{ $gettext('Easy to use') }}

-

{{ $t('Funkwhale is dead simple to use.') }}

+

{{ $gettext('Funkwhale is dead simple to use.') }}

- {{ $t('No add-ons, no plugins : you only need a web library') }} + {{ $gettext('No add-ons, no plugins : you only need a web library') }}
- {{ $t('Access your music from a clean interface that focus on what really matters') }} + {{ $gettext('Access your music from a clean interface that focus on what really matters') }}
@@ -112,26 +115,26 @@

- {{ $t('Your music, your way') }} + {{ $gettext('Your music, your way') }}

-

{{ $t('Funkwhale is free and gives you control on your music.') }}

+

{{ $gettext('Funkwhale is free and gives you control on your music.') }}

- {{ $t('The plaform is free and open-source, you can install it and modify it without worries') }} + {{ $gettext('The plaform is free and open-source, you can install it and modify it without worries') }}
- {{ $t('We do not track you or bother you with ads') }} + {{ $gettext('We do not track you or bother you with ads') }}
- {{ $t('You can invite friends and family to your instance so they can enjoy your music') }} + {{ $gettext('You can invite friends and family to your instance so they can enjoy your music') }}
diff --git a/front/src/components/PageNotFound.vue b/front/src/components/PageNotFound.vue index b4d2250ca..150abd8c0 100644 --- a/front/src/components/PageNotFound.vue +++ b/front/src/components/PageNotFound.vue @@ -5,13 +5,14 @@

- {{ $t('Whale') }} {{ $t('Page not found!') }} + {{ $gettext('Whale') }} {{ $gettext('Page not found!') }}

-

{{ $t('We\'re sorry, the page you asked for does not exists.') }}

- {{ path }} +

{{ $gettext('We\'re sorry, the page you asked for does not exist:') }}

+ {{ path }} + - {{ $t('Go to home page') }} + {{ $gettext('Go to home page') }}
diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index 9eec6c0e2..439a1e630 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -18,13 +18,13 @@
@@ -32,40 +32,45 @@
@@ -141,10 +153,10 @@
- {{ $t('You have a radio playing') }} + {{ $gettext('You have a radio playing') }}
-

{{ $t('New tracks will be appended here automatically.') }}

-
{{ $t('Stop radio') }}
+

{{ $gettext('New tracks will be appended here automatically.') }}

+
{{ $gettext('Stop radio') }}
diff --git a/front/src/components/activity/Like.vue b/front/src/components/activity/Like.vue index 5396accc2..8e35598d5 100644 --- a/front/src/components/activity/Like.vue +++ b/front/src/components/activity/Like.vue @@ -5,20 +5,12 @@
- - - + %{ user } favorited a track
{{ event.object.name }} - - {{ event.object.album }} - {{ event.object.artist }} - - - {{ event.object.artist }} - + from %{ album } by %{ artist }
diff --git a/front/src/components/activity/Listen.vue b/front/src/components/activity/Listen.vue index bfa3ca164..2d1a3c184 100644 --- a/front/src/components/activity/Listen.vue +++ b/front/src/components/activity/Listen.vue @@ -5,20 +5,12 @@
- - - - - + %{ user } listened to a track +
{{ event.object.name }} - - {{ event.object.album }}{{ event.object.artist }} - - - {{ event.object.artist }} - + from %{ album } by %{ artist }
diff --git a/front/src/components/admin/SettingsGroup.vue b/front/src/components/admin/SettingsGroup.vue index f6d57c239..8ba0fb6f1 100644 --- a/front/src/components/admin/SettingsGroup.vue +++ b/front/src/components/admin/SettingsGroup.vue @@ -3,13 +3,13 @@

{{ group.label }}

-
{{ $t('Error while saving settings') }}
+
{{ $gettext('Error while saving settings') }}
  • {{ error }}
- {{ $t('Settings updated successfully.') }} + {{ $gettext('Settings updated successfully.') }}

{{ group.help }}

@@ -61,7 +61,7 @@ diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue index 9777fa83c..5c057245b 100644 --- a/front/src/components/audio/PlayButton.vue +++ b/front/src/components/audio/PlayButton.vue @@ -1,19 +1,19 @@