From c744410f6fd011290ffa7ea663676976f5b385c5 Mon Sep 17 00:00:00 2001 From: Bat Date: Thu, 19 Apr 2018 19:52:27 +0100 Subject: [PATCH 1/2] Translate root components --- front/src/components/About.vue | 7 ++-- front/src/components/Home.vue | 54 ++++++++++++++------------- front/src/components/PageNotFound.vue | 8 ++-- front/src/components/Sidebar.vue | 36 +++++++++--------- 4 files changed, 54 insertions(+), 51 deletions(-) diff --git a/front/src/components/About.vue b/front/src/components/About.vue index 09a5ee24c..524191250 100644 --- a/front/src/components/About.vue +++ b/front/src/components/About.vue @@ -3,15 +3,16 @@

- - + +

- Unfortunately, owners of this instance did not yet take the time to complete this page.

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

diff --git a/front/src/components/Home.vue b/front/src/components/Home.vue index ce1307ff0..f54ebfe6e 100644 --- a/front/src/components/Home.vue +++ b/front/src/components/Home.vue @@ -3,15 +3,15 @@

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

-

We think listening music should be simple.

+

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

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

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

-

That's simple: we loved Grooveshark and we want to build something even better.

-
+

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

+ $t
@@ -35,26 +35,26 @@

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

-

Funkwhale is designed to make it easy to listen to music you like, or to discover new artists.

+

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

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

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

-

Funkwhale takes care of handling your music.

+

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

- Import music from various platforms, such as YouTube or SoundCloud + {{ $t('Import music from various platforms, such as YouTube or SoundCloud') }}
- Get quality metadata about your music thanks to MusicBrainz + + {{ $t('MusicBrainz') }} +
- Covers, lyrics, our goal is to have them all ;) + {{ $t('Covers, lyrics, our goal is to have them all ;)') }}
@@ -89,20 +91,20 @@

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

-

Funkwhale is dead simple to use.

+

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

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

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

-

Funkwhale is free and gives you control on your music.

+

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

- The plaform is free and open-source, you can install it and modify it without worries + {{ $t('The plaform is free and open-source, you can install it and modify it without worries') }}
- We do not track you or bother you with ads + {{ $t('We do not track you or bother you with ads') }}
- You can invite friends and family to your instance so they can enjoy your music + {{ $t('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 25e6f86fd..b4d2250ca 100644 --- a/front/src/components/PageNotFound.vue +++ b/front/src/components/PageNotFound.vue @@ -5,13 +5,13 @@

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

-

We're sorry, the page you asked for does not exists.

-

Requested URL: {{ path }}

+

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

+ {{ path }} - Go to home page + {{ $t('Go to home page') }}
diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index 45487b6fb..602882123 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -18,12 +18,12 @@
Browse - Queue   + {{ $t('Queue') }}
@@ -31,23 +31,23 @@
- Logged in as {{ $store.state.auth.username }} - Logout - Login - Browse library - Favorites + {{ $t('Logged in as {%name%}', { name: $store.state.auth.username }) }} + {{ $t('Logout') }} + {{ $t('Login') }} + {{ $t('Browse library') }} + {{ $t('Favorites') }} - Playlists + {{ $t('Playlists') }} Activity + class="item" :to="{path: '/activity'}"> {{ $t('Activity') }} Federation + :to="{path: '/manage/federation/libraries'}"> {{ $t('Federation') }}
@@ -56,12 +56,12 @@
- Do you want to restore your previous queue? + {{ $t('Do you want to restore your previous queue?') }}
-

{{ queue.previousQueue.tracks.length }} tracks

+

{{ $t('{%count%} tracks', { count: queue.previousQueue.tracks.length }) }}

-
Yes
-
No
+
{{ $t('Yes') }}
+
{{ $t('No') }}
@@ -93,10 +93,10 @@
- You have a radio playing + {{ $t('You have a radio playing') }}
-

New tracks will be appended here automatically.

-
Stop radio
+

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

+
{{ $t('Stop radio') }}
From 0f4108f0d86b8dac0331c5203f455bc94f246657 Mon Sep 17 00:00:00 2001 From: Bat Date: Sun, 22 Apr 2018 09:47:13 +0100 Subject: [PATCH 2/2] Put in its place --- front/src/components/Home.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/components/Home.vue b/front/src/components/Home.vue index f54ebfe6e..03f4513e6 100644 --- a/front/src/components/Home.vue +++ b/front/src/components/Home.vue @@ -24,8 +24,8 @@

{{ $t('Why funkwhale?') }}

-

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

- $t
+

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

+