diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index b3facd646ab90efbadcb19e3547d81947e721f51..f92d73438b486c73f00f0492ce18175c4a99401d 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -435,7 +435,6 @@ This hierarchical structure is made of several parts: - ``Popup`` - ``Sidebar`` - ``Head`` - - ``Popup`` - ``*`` for strings that are not tied to a specific location - The feature part, which is required, and refers to the feature associated with the translated string: diff --git a/front/src/views/content/Base.vue b/front/src/views/content/Base.vue index b92a88bd7162546e20113bd78a99439f64aec695..daa45e4dc660b53ab3d342315f5a210da956b266 100644 --- a/front/src/views/content/Base.vue +++ b/front/src/views/content/Base.vue @@ -3,10 +3,10 @@ <nav class="ui secondary pointing menu" role="navigation" :aria-label="labels.secondaryMenu"> <router-link class="ui item" - :to="{name: 'content.libraries.index'}"><translate>Libraries</translate></router-link> + :to="{name: 'content.libraries.index'}"><translate :translate-context="'Menu/Library/Tab.Link'">Libraries</translate></router-link> <router-link class="ui item" - :to="{name: 'content.libraries.files'}"><translate>Tracks</translate></router-link> + :to="{name: 'content.libraries.files'}"><translate :translate-context="'Menu/Library/Tab.Link'">Tracks</translate></router-link> </nav> <router-view :key="$route.fullPath"></router-view> </main> @@ -15,7 +15,7 @@ export default { computed: { labels() { - let title = this.$gettext("Add content") + let title = this.$pgettext('Head/Library/Title', "Add content") let secondaryMenu = this.$pgettext('Menu/*/Hidden text', "Secondary menu") return { title, diff --git a/front/src/views/content/Home.vue b/front/src/views/content/Home.vue index a23a0e383a1627cffdc38d74856132ef1b7ddbd1..d7753fd3ab86042cf02d39d1ea86778f4b2d50f0 100644 --- a/front/src/views/content/Home.vue +++ b/front/src/views/content/Home.vue @@ -2,22 +2,22 @@ <section class="ui vertical aligned stripe segment" v-title="labels.title"> <div class="ui text container"> <h1>{{ labels.title }}</h1> - <p><translate>There are various ways to grab new content and make it available here.</translate></p> + <p><translate :translate-context="'Content/Library/Paragraph'">There are various ways to grab new content and make it available here.</translate></p> <div class="ui segment"> - <h2><translate>Upload audio content</translate></h2> - <p><translate>Upload music files (MP3, OGG, FLAC, etc.) from your personal library directly from your browser to enjoy them here.</translate></p> + <h2><translate :translate-context="'Content/Library/Title/Verb'">Upload audio content</translate></h2> + <p><translate :translate-context="'Content/Library/Paragraph'">Upload music files (MP3, OGG, FLAC, etc.) from your personal library directly from your browser to enjoy them here.</translate></p> <p> - <strong><translate :translate-params="{quota: defaultQuota}">This instance offers up to %{quota} of storage space for every user.</translate></strong> + <strong><translate :translate-context="'Content/Library/Paragraph'" :translate-params="{quota: defaultQuota}">This instance offers up to %{quota} of storage space for every user.</translate></strong> </p> <router-link :to="{name: 'content.libraries.index'}" class="ui green button"> - <translate>Get started</translate> + <translate :translate-context="'Content/Library/Button.Label/Verb'">Get started</translate> </router-link> </div> <div class="ui segment"> - <h2><translate>Follow remote libraries</translate></h2> - <p><translate>You can follow libraries from other users to get access to new music. Public libraries can be followed immediatly, while following a private library requires approval from its owner.</translate></p> + <h2><translate :translate-context="'Content/Library/Title/Verb'">Follow remote libraries</translate></h2> + <p><translate :translate-context="'Content/Library/Paragraph'">You can follow libraries from other users to get access to new music. Public libraries can be followed immediatly, while following a private library requires approval from its owner.</translate></p> <router-link :to="{name: 'content.remote.index'}" class="ui green button"> - <translate>Get started</translate> + <translate :translate-context="'Content/Library/Button.Label/Verb'">Get started</translate> </router-link> </div> @@ -32,7 +32,7 @@ export default { computed: { labels() { return { - title: this.$gettext("Add and manage content") + title: this.$pgettext('Content/Library/Title/Verb', "Add and manage content") } }, defaultQuota() {