From 3b9fd20d3bfde716b0b9eebb93fba03220565a2a Mon Sep 17 00:00:00 2001 From: jovuit Date: Fri, 1 Mar 2019 14:29:58 +0100 Subject: [PATCH] Added translation context Minor rewording Added changelog fragment --- changes/changelog.d/662.enhancement | 1 + front/src/components/About.vue | 10 +-- front/src/components/Footer.vue | 30 ++++----- front/src/components/Home.vue | 50 +++++++-------- front/src/components/PageNotFound.vue | 8 +-- front/src/components/Pagination.vue | 2 +- front/src/components/ShortcutsModal.vue | 24 +++---- front/src/components/Sidebar.vue | 64 +++++++++---------- front/src/components/admin/SettingsGroup.vue | 6 +- .../components/federation/LibraryWidget.vue | 2 +- front/src/components/forms/PasswordInput.vue | 2 +- front/src/components/instance/Stats.vue | 18 +++--- .../notifications/NotificationRow.vue | 12 ++-- front/src/components/radios/Button.vue | 4 +- front/src/components/radios/Card.vue | 2 +- 15 files changed, 118 insertions(+), 117 deletions(-) create mode 100644 changes/changelog.d/662.enhancement diff --git a/changes/changelog.d/662.enhancement b/changes/changelog.d/662.enhancement new file mode 100644 index 000000000..cda19e4ed --- /dev/null +++ b/changes/changelog.d/662.enhancement @@ -0,0 +1 @@ +Added standardized translation context for all strings in the frontend to give accurate hints to translators. diff --git a/front/src/components/About.vue b/front/src/components/About.vue index cfffb7b6a..f29f960f8 100644 --- a/front/src/components/About.vue +++ b/front/src/components/About.vue @@ -3,10 +3,10 @@

- + About %{ instance } - About this instance + About this instance

@@ -15,12 +15,12 @@

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

+ v-if="!instance.short_description.value && !instance.long_description.value">Unfortunately, the owners of this instance did not yet take the time to complete this page.

- Edit instance info + Edit instance info
@@ -64,7 +64,7 @@ export default { }), labels() { return { - title: this.$gettext("About this instance") + title: this.$pgettext('Head/About/Title', "About this instance") } } } diff --git a/front/src/components/Footer.vue b/front/src/components/Footer.vue index e45a9b47b..00ec4f79c 100644 --- a/front/src/components/Footer.vue +++ b/front/src/components/Footer.vue @@ -4,22 +4,22 @@

- About %{instanceName} + About %{instanceName}

- About page + About page
- Version %{version} + Version %{version}
- Use another instance + Use another instance
- + @@ -29,29 +29,29 @@

Using Funkwhale

- Documentation - Mobile and desktop apps -
Keyboard shortcuts
+ Documentation + Mobile and desktop apps +
Keyboard shortcuts

Getting help

- Support forum - Chat room - Issue tracker + Support forum + Chat room + Issue tracker

About Funkwhale

- Official website - Contribute - Source code + Official website + Contribute + Source code

- The funkwhale logo was kindly designed and provided by Francis Gading. + The funkwhale logo was kindly designed and provided by Francis Gading.

diff --git a/front/src/components/Home.vue b/front/src/components/Home.vue index bdca00005..747121fd3 100644 --- a/front/src/components/Home.vue +++ b/front/src/components/Home.vue @@ -3,15 +3,15 @@

- Welcome on Funkwhale + Welcome on Funkwhale

-

We think listening to music should be simple.

+

We think listening to music should be simple.

- Learn more about this instance + Learn more about this instance - Get me to the library + Get me to the library
@@ -22,9 +22,9 @@

- Why funkwhale? + 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.

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

- Unlimited music + Unlimited music

-

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

+

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 + Click once, listen for hours using built-in radios
- Keep a track of your favorite songs + Keep a track of your favorite songs
- Playlists? We got them + Playlists? We got them
@@ -62,14 +62,14 @@

- Clean library + A clean library

-

Funkwhale takes care of handling your music.

+

Funkwhale takes care of handling your music.

- Import music from various platforms, such as YouTube or SoundCloud + Import music from various platforms, such as YouTube or SoundCloud
@@ -83,7 +83,7 @@
- Covers, lyrics, our goal is to have them all ;) + Covers, lyrics, our goal is to have them all ;)
@@ -91,20 +91,20 @@

- Easy to use + Easy to use

-

Funkwhale is dead simple to use.

+

Funkwhale is dead simple to use.

- No add-ons, no plugins : you only need a web library + No add-ons, no plugins : you only need a web library
- Access your music from a clean interface that focus on what really matters + Access your music from a clean interface that focus on what really matters
@@ -112,26 +112,26 @@

- Your music, your way + Your music, your way

-

Funkwhale is free and gives you control on your music.

+

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 + 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 + 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 + You can invite friends and family to your instance so they can enjoy your music
@@ -150,7 +150,7 @@ export default { computed: { labels() { return { - title: this.$gettext("Welcome") + title: this.$pgettext('Head/Home/Title', "Welcome") } } } diff --git a/front/src/components/PageNotFound.vue b/front/src/components/PageNotFound.vue index ef4e66f45..5b91d2a47 100644 --- a/front/src/components/PageNotFound.vue +++ b/front/src/components/PageNotFound.vue @@ -5,14 +5,14 @@

- Page not found! + Page not found!

-

We're sorry, the page you asked for does not exist:

+

Sorry, the page you asked for does not exist:

{{ path }} - Go to home page + Go to home page
@@ -30,7 +30,7 @@ export default { computed: { labels() { return { - title: this.$gettext("Page Not Found") + title: this.$pgettext('Head/*/Title', "Page Not Found") } } } diff --git a/front/src/components/Pagination.vue b/front/src/components/Pagination.vue index 963b000a8..482082238 100644 --- a/front/src/components/Pagination.vue +++ b/front/src/components/Pagination.vue @@ -36,7 +36,7 @@ export default { computed: { labels() { return { - pagination: this.$gettext("Pagination") + pagination: this.$pgettext('Content/*/Hidden text/Noun', "Pagination") } }, pages: function() { diff --git a/front/src/components/ShortcutsModal.vue b/front/src/components/ShortcutsModal.vue index 2338658dd..9bae0a9ca 100644 --- a/front/src/components/ShortcutsModal.vue +++ b/front/src/components/ShortcutsModal.vue @@ -1,7 +1,7 @@ @@ -35,11 +35,11 @@ export default { sections () { return [ { - title: this.$gettext('General shortcuts'), + title: this.$pgettext('Popup/Keyboard shortcuts/Title', 'General shortcuts'), shortcuts: [ { key: 'h', - summary: this.$gettext('Show available keyboard shortcuts') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Show available keyboard shortcuts') } ] }, @@ -52,35 +52,35 @@ export default { // s.prevent.exact="shuffle" { - title: this.$gettext('Audio player shortcuts'), + title: this.$pgettext('Popup/Keyboard shortcuts/Title', 'Audio player shortcuts'), shortcuts: [ { key: 'space', - summary: this.$gettext('Pause/play the current track') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Pause/play the current track') }, { key: 'ctrl left', - summary: this.$gettext('Play previous track') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Play previous track') }, { key: 'ctrl right', - summary: this.$gettext('Play next track') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Play next track') }, { key: 'ctrl up', - summary: this.$gettext('Increase volume') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Increase volume') }, { key: 'ctrl down', - summary: this.$gettext('Decrease volume') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Decrease volume') }, { key: 'l', - summary: this.$gettext('Toggle queue looping') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Toggle queue looping') }, { key: 's', - summary: this.$gettext('Shuffle queue') + summary: this.$pgettext('Popup/Keyboard shortcuts/Table.Label/Verb', 'Shuffle queue') }, ] } diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index 77b9c02f5..31b35ebdc 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -16,13 +16,13 @@
- Browse + Browse - Queue  + Queue  - + (%{ index } of %{ length }) @@ -32,76 +32,76 @@
@@ -218,10 +218,10 @@ export default { url: state => state.route.path }), labels() { - let mainMenu = this.$gettext("Main menu") - let selectTrack = this.$gettext("Play this track") - let pendingFollows = this.$gettext("Pending follow requests") - let pendingReviewEdits = this.$gettext("Pending review edits") + let mainMenu = this.$pgettext('Sidebar/*/Hidden text', "Main menu") + let selectTrack = this.$pgettext('Sidebar/Player/Hidden text', "Play this track") + let pendingFollows = this.$pgettext('Sidebar/Notifications/Hidden text', "Pending follow requests") + let pendingReviewEdits = this.$pgettext('Sidebar/Moderation/Hidden text', "Pending review edits") return { pendingFollows, mainMenu, diff --git a/front/src/components/admin/SettingsGroup.vue b/front/src/components/admin/SettingsGroup.vue index 85bb9eeae..cb1ddad27 100644 --- a/front/src/components/admin/SettingsGroup.vue +++ b/front/src/components/admin/SettingsGroup.vue @@ -3,13 +3,13 @@

{{ group.label }}

-
Error while saving settings
+
Error while saving settings
  • {{ error }}
- Settings updated successfully. + Settings updated successfully.

{{ group.help }}

@@ -65,7 +65,7 @@ diff --git a/front/src/components/federation/LibraryWidget.vue b/front/src/components/federation/LibraryWidget.vue index b9554d01f..7ec311760 100644 --- a/front/src/components/federation/LibraryWidget.vue +++ b/front/src/components/federation/LibraryWidget.vue @@ -4,7 +4,7 @@

-

No matching library.

+

No matching library.

diff --git a/front/src/components/forms/PasswordInput.vue b/front/src/components/forms/PasswordInput.vue index 26454048e..d57e3017f 100644 --- a/front/src/components/forms/PasswordInput.vue +++ b/front/src/components/forms/PasswordInput.vue @@ -23,7 +23,7 @@ export default { computed: { labels () { return { - title: this.$gettext('Show/hide password') + title: this.$pgettext('Content/Settings/Button.Tooltip/Verb', 'Show/hide password') } }, passwordInputType () { diff --git a/front/src/components/instance/Stats.vue b/front/src/components/instance/Stats.vue index 78632f6d2..831bdbdcc 100644 --- a/front/src/components/instance/Stats.vue +++ b/front/src/components/instance/Stats.vue @@ -3,7 +3,7 @@

- User activity + User activity

@@ -11,48 +11,48 @@ {{ stats.users }}
-
users
+
users
{{ stats.listenings }}
-
tracks listened
+
tracks listened
{{ stats.trackFavorites }}
-
Tracks favorited
+
Tracks favorited
-

Library

+

Library

{{ parseInt(stats.musicDuration) }}
-
Hours of music
+
Hours of music
{{ stats.artists }}
-
Artists
+
Artists
{{ stats.albums }}
-
Albums
+
Albums
{{ stats.tracks }}
-
tracks
+
Tracks
diff --git a/front/src/components/notifications/NotificationRow.vue b/front/src/components/notifications/NotificationRow.vue index e98be41ec..7843ae145 100644 --- a/front/src/components/notifications/NotificationRow.vue +++ b/front/src/components/notifications/NotificationRow.vue @@ -36,15 +36,15 @@ export default { return 'plop' }, labels () { - let libraryFollowMessage = this.$gettext('%{ username } followed your library "%{ library }"') - let libraryAcceptFollowMessage = this.$gettext('%{ username } accepted your follow on library "%{ library }"') - let libraryPendingFollowMessage = this.$gettext('%{ username } wants to follow your library "%{ library }"') + let libraryFollowMessage = this.$pgettext('Content/Notifications/Paragraph', '%{ username } followed your library "%{ library }"') + let libraryAcceptFollowMessage = this.$pgettext('Content/Notifications/Paragraph', '%{ username } accepted your follow on library "%{ library }"') + let libraryPendingFollowMessage = this.$pgettext('Content/Notifications/Paragraph', '%{ username } wants to follow your library "%{ library }"') return { libraryFollowMessage, libraryAcceptFollowMessage, libraryPendingFollowMessage, - markRead: this.$gettext('Mark as read'), - markUnread: this.$gettext('Mark as unread'), + markRead: this.$pgettext('Content/Notifications/Button.Tooltip/Verb', 'Mark as read'), + markUnread: this.$pgettext('Content/Notifications/Button.Tooltip/Verb', 'Mark as unread'), } }, @@ -63,7 +63,7 @@ export default { action = { buttonClass: 'green', icon: 'check', - label: this.$gettext('Approve'), + label: this.$pgettext('Content/Notifications/Button.Label/Short, Verb', 'Approve'), handler: () => { self.approveLibraryFollow(a.related_object) } } } else { diff --git a/front/src/components/radios/Button.vue b/front/src/components/radios/Button.vue index 716cc66e1..6b26397d1 100644 --- a/front/src/components/radios/Button.vue +++ b/front/src/components/radios/Button.vue @@ -1,8 +1,8 @@ diff --git a/front/src/components/radios/Card.vue b/front/src/components/radios/Card.vue index 9f0854841..d83eb7006 100644 --- a/front/src/components/radios/Card.vue +++ b/front/src/components/radios/Card.vue @@ -21,7 +21,7 @@ class="ui basic yellow button right floated" v-if="$store.state.auth.authenticated && type === 'custom' && radio.user.id === $store.state.auth.profile.id" :to="{name: 'library.radios.edit', params: {id: customRadioId }}"> - Edit… + Edit…