diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 05254b76d..63cc2d771 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -431,10 +431,10 @@ This hierarchical structure is made of several parts: - The location part, which is required and refers to the big blocks found in Funkwhale UI where the translated string is displayed: - ``Content`` - ``Footer`` + - ``Head`` - ``Menu`` - ``Popup`` - ``Sidebar`` - - ``Head`` - ``*`` 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: @@ -462,11 +462,13 @@ This hierarchical structure is made of several parts: - The component part, which is required and refers to the type of element that contain the string: - ``Button`` - ``Card`` + - ``Checkbox`` - ``Dropdown`` - ``Error message`` - ``Form`` - ``Header`` - ``Help text`` + - ``Hidden text`` - ``Icon`` - ``Input`` - ``Image`` @@ -481,15 +483,15 @@ This hierarchical structure is made of several parts: - ``Table`` - ``Title`` - ``Tooltip`` - - ``Hidden text`` - ``*`` 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: + - ``Adjective`` - ``Call to action`` - - ``Verb`` - ``Noun`` - ``Short`` - ``Unit`` + - ``Verb`` Here are a few examples of valid context hierarchies: @@ -498,6 +500,7 @@ Here are a few examples of valid context hierarchies: - ``Footer/*/Help text`` - ``*/*/*/Verb, Short`` - ``Popup/Playlist/Button`` +- ``Content/Admin/Table.Label/Short, Noun (Value is a date)`` It's possible to nest multiple component parts to reach a higher level of detail. The component parts are then separated by a dot: diff --git a/front/src/components/manage/library/FilesTable.vue b/front/src/components/manage/library/FilesTable.vue index 23f33d0f3..4716e361a 100644 --- a/front/src/components/manage/library/FilesTable.vue +++ b/front/src/components/manage/library/FilesTable.vue @@ -3,11 +3,11 @@
- +
- +
- +
@@ -35,14 +35,14 @@ :action-url="'manage/library/uploads/action/'" :filters="actionFilters"> @@ -95,7 +95,7 @@ > - Showing results %{ start }-%{ end } on %{ total } @@ -173,7 +173,7 @@ export default { computed: { labels () { return { - searchPlaceholder: this.$gettext('Search by title, artist, domain…') + searchPlaceholder: this.$pgettext('Content/Search/Input.Placeholder', 'Search by title, artist, domain…') } }, actionFilters () { @@ -187,7 +187,7 @@ export default { } }, actions () { - let msg = this.$gettext('Delete') + let msg = this.$pgettext('Content/Library/Dropdown/Verb', 'Delete') return [ { name: 'delete', diff --git a/front/src/components/manage/moderation/AccountsTable.vue b/front/src/components/manage/moderation/AccountsTable.vue index 8259e8ec8..d8897ab3b 100644 --- a/front/src/components/manage/moderation/AccountsTable.vue +++ b/front/src/components/manage/moderation/AccountsTable.vue @@ -3,13 +3,13 @@
- +
- +
- +
@@ -37,12 +37,12 @@ action-url="manage/accounts/action/" :filters="actionFilters"> - Local account + Local account @@ -70,7 +70,7 @@ - Yes + Yes @@ -86,7 +86,7 @@ > - Showing results %{ start }-%{ end } on %{ total } @@ -168,7 +168,7 @@ export default { computed: { labels () { return { - searchPlaceholder: this.$gettext('Search by domain, username, bio…') + searchPlaceholder: this.$pgettext('Content/Search/Input.Placeholder', 'Search by domain, username, bio…') } }, actionFilters () { @@ -185,7 +185,7 @@ export default { return [ { name: 'purge', - label: this.$gettext('Purge'), + label: this.$pgettext('Content/Moderation/Dropdown/Verb', 'Purge'), isDangerous: true } ] diff --git a/front/src/components/manage/moderation/DomainsTable.vue b/front/src/components/manage/moderation/DomainsTable.vue index ed9eb5be8..f07a1e426 100644 --- a/front/src/components/manage/moderation/DomainsTable.vue +++ b/front/src/components/manage/moderation/DomainsTable.vue @@ -3,11 +3,11 @@
- +
- +
- +
@@ -36,11 +36,11 @@ idField="name" :filters="actionFilters"> @@ -72,7 +72,7 @@ > - Showing results %{ start }-%{ end } on %{ total } @@ -148,7 +148,7 @@ export default { computed: { labels () { return { - searchPlaceholder: this.$gettext('Search by name…') + searchPlaceholder: this.$pgettext('Content/Search/Input.Placeholder', 'Search by name…') } }, actionFilters () { @@ -165,7 +165,7 @@ export default { return [ { name: 'purge', - label: this.$gettext('Purge'), + label: this.$pgettext('Content/Moderation/Dropdown/Verb', 'Purge'), isDangerous: true } ] diff --git a/front/src/components/manage/moderation/InstancePolicyCard.vue b/front/src/components/manage/moderation/InstancePolicyCard.vue index b72c6bac8..f88f0487e 100644 --- a/front/src/components/manage/moderation/InstancePolicyCard.vue +++ b/front/src/components/manage/moderation/InstancePolicyCard.vue @@ -6,44 +6,44 @@ {{ object.actor }}  

-

Rule

+

Rule

- Block everything + Block everything

-
Mute activity
+
Mute activity
-
Mute notifications
+
Mute notifications
-
Reject media
+
Reject media
-

Reason

+

Reason

diff --git a/front/src/components/manage/moderation/InstancePolicyForm.vue b/front/src/components/manage/moderation/InstancePolicyForm.vue index e90f9ad10..05ccecc53 100644 --- a/front/src/components/manage/moderation/InstancePolicyForm.vue +++ b/front/src/components/manage/moderation/InstancePolicyForm.vue @@ -1,11 +1,11 @@ @@ -55,7 +55,7 @@ export default { computed: { labels () { return { - placeholder: this.$gettext('Leave empty for a random code') + placeholder: this.$pgettext('Content/Admin/Input.Placeholder', 'Leave empty for a random code') } } }, diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue index ee9eb5035..38cf15b77 100644 --- a/front/src/components/manage/users/InvitationsTable.vue +++ b/front/src/components/manage/users/InvitationsTable.vue @@ -3,11 +3,11 @@
- +
- +
- +
@@ -36,20 +36,20 @@ :action-url="'manage/users/invitations/action/'" :filters="actionFilters">