Merge branch '662-admin-users-Base.vue' into 'develop'

Resolve "Add contexts to translatable strings"

See merge request funkwhale/funkwhale!593
This commit is contained in:
Eliot Berriot 2019-02-11 09:42:05 +01:00
commit 78703e26d5
2 changed files with 5 additions and 4 deletions

View File

@ -478,6 +478,7 @@ This hierarchical structure is made of several parts:
- ``Table`` - ``Table``
- ``Title`` - ``Title``
- ``Tooltip`` - ``Tooltip``
- ``Hidden text``
- ``*`` for strings that are not tied to a specific component - ``*`` for strings that are not tied to a specific component
The detail part, which is optional and refers to the contents of the string itself, such as: The detail part, which is optional and refers to the contents of the string itself, such as:

View File

@ -3,10 +3,10 @@
<nav class="ui secondary pointing menu" role="navigation" :aria-label="labels.secondaryMenu"> <nav class="ui secondary pointing menu" role="navigation" :aria-label="labels.secondaryMenu">
<router-link <router-link
class="ui item" class="ui item"
:to="{name: 'manage.users.users.list'}"><translate>Users</translate></router-link> :to="{name: 'manage.users.users.list'}"><translate :translate-context="'*/Admin/Link'">Users</translate></router-link>
<router-link <router-link
class="ui item" class="ui item"
:to="{name: 'manage.users.invitations.list'}"><translate>Invitations</translate></router-link> :to="{name: 'manage.users.invitations.list'}"><translate :translate-context="'Menu/Admin/Link'">Invitations</translate></router-link>
</nav> </nav>
<router-view :key="$route.fullPath"></router-view> <router-view :key="$route.fullPath"></router-view>
</div> </div>
@ -17,8 +17,8 @@ export default {
computed: { computed: {
labels() { labels() {
return { return {
manageUsers: this.$gettext("Manage users"), manageUsers: this.$pgettext('Head/Admin/Title', 'Manage users'),
secondaryMenu: this.$gettext("Secondary menu") secondaryMenu: this.$pgettext('Menu/*/Hidden text','Secondary menu')
} }
} }
} }