From e250f4bd3a03d525faed9efb2e2f4421d6aa3f08 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Sun, 10 Feb 2019 14:45:40 +0100
Subject: [PATCH 1/3] Added translation context for
 admin/moderation/AccountsList.vue

---
 front/src/views/admin/moderation/AccountsList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/views/admin/moderation/AccountsList.vue b/front/src/views/admin/moderation/AccountsList.vue
index 877c96c5e..09c491faf 100644
--- a/front/src/views/admin/moderation/AccountsList.vue
+++ b/front/src/views/admin/moderation/AccountsList.vue
@@ -1,7 +1,7 @@
 <template>
   <main v-title="labels.accounts">
     <section class="ui vertical stripe segment">
-      <h2 class="ui header"><translate>Accounts</translate></h2>
+      <h2 class="ui header"><translate :translate-context="'Content/Moderation/Title'">Accounts</translate></h2>
       <div class="ui hidden divider"></div>
       <accounts-table :update-url="true" :default-query="defaultQuery"></accounts-table>
     </section>
@@ -21,7 +21,7 @@ export default {
   computed: {
     labels() {
       return {
-        accounts: this.$gettext("Accounts")
+        accounts: this.$pgettext('Head/Moderation/Title', "Accounts")
       }
     }
   }

From 858d91784a29d0d8b190f07d7765c1fdd3002d3e Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Sun, 10 Feb 2019 15:12:07 +0100
Subject: [PATCH 2/3] Added translation string context for
 admin/moderation/DomainsDetail.vue

---
 .../views/admin/moderation/DomainsDetail.vue  | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/front/src/views/admin/moderation/DomainsDetail.vue b/front/src/views/admin/moderation/DomainsDetail.vue
index f5f9643c8..e51fcd307 100644
--- a/front/src/views/admin/moderation/DomainsDetail.vue
+++ b/front/src/views/admin/moderation/DomainsDetail.vue
@@ -14,7 +14,7 @@
                   {{ object.name }}
                   <div class="sub header">
                     <a :href="externalUrl" target="_blank" rel="noopener noreferrer" class="logo-wrapper">
-                      <translate>Open website</translate>&nbsp;
+                      <translate :translate-context="'Content/Moderation/Link/Verb'">Open website</translate>&nbsp;
                       <i class="external icon"></i>
                     </a>
                   </div>
@@ -37,16 +37,16 @@
                 <header class="ui header">
                   <h3>
                     <i class="shield icon"></i>
-                    <translate>You don't have any rule in place for this domain.</translate>
+                    <translate :translate-context="'Content/Moderation/Card.Title'">You don't have any rule in place for this domain.</translate>
                   </h3>
                 </header>
-                <p><translate>Moderation policies help you control how your instance interact with a given domain or account.</translate></p>
+                <p><translate :translate-context="'Content/Moderation/Card.Paragraph'">Moderation policies help you control how your instance interact with a given domain or account.</translate></p>
                 <button @click="showPolicyForm = true" class="ui primary button">Add a moderation policy</button>
               </template>
               <instance-policy-card v-else-if="policy && !showPolicyForm" :object="policy" @update="showPolicyForm = true">
                 <header class="ui header">
                   <h3>
-                    <translate>This domain is subject to specific moderation rules</translate>
+                    <translate :translate-context="'Content/Moderation/Card.Title'">This domain is subject to specific moderation rules</translate>
                   </h3>
                 </header>
               </instance-policy-card>
@@ -69,14 +69,14 @@
               <h3 class="ui header">
                 <i class="info icon"></i>
                 <div class="content">
-                  <translate>Instance data</translate>
+                  <translate :translate-context="'Content/Moderation/Title'">Instance data</translate>
                 </div>
               </h3>
               <table class="ui very basic table">
                 <tbody>
                   <tr>
                     <td>
-                      <translate>First seen</translate>
+                      <translate :translate-context="'Content/*/Table.Label'">First seen</translate>
                     </td>
                     <td>
                       <human-date :date="object.creation_date"></human-date>
@@ -84,18 +84,18 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Last checked</translate>
+                      <translate :translate-context="'Content/*/Table.Label'">Last checked</translate>
                     </td>
                     <td>
                       <human-date v-if="object.nodeinfo_fetch_date" :date="object.nodeinfo_fetch_date"></human-date>
-                      <translate v-else>N/A</translate>
+                      <translate v-else :translate-context="'*/*/*'">N/A</translate>
                     </td>
                   </tr>
 
                   <template v-if="object.nodeinfo && object.nodeinfo.status === 'ok'">
                     <tr>
                       <td>
-                        <translate>Software</translate>
+                        <translate :translate-context="'Content/Moderation/Table.Label'">Software</translate>
                       </td>
                       <td>
                         {{ lodash.get(object, 'nodeinfo.payload.software.name', $gettext('N/A')) }} ({{ lodash.get(object, 'nodeinfo.payload.software.version', $gettext('N/A')) }})
@@ -103,7 +103,7 @@
                     </tr>
                     <tr>
                       <td>
-                        <translate>Name</translate>
+                        <translate :translate-context="'Content/Moderation/Table.Label'">Name</translate>
                       </td>
                       <td>
                         {{ lodash.get(object, 'nodeinfo.payload.metadata.nodeName', $gettext('N/A')) }}
@@ -111,7 +111,7 @@
                     </tr>
                     <tr>
                       <td>
-                        <translate>Total users</translate>
+                        <translate :translate-context="'Content/*/*'">Total users</translate>
                       </td>
                       <td>
                         {{ lodash.get(object, 'nodeinfo.payload.usage.users.total', $gettext('N/A')) }}
@@ -121,10 +121,10 @@
                   <template v-if="object.nodeinfo && object.nodeinfo.status === 'error'">
                     <tr>
                       <td>
-                        <translate>Status</translate>
+                        <translate :translate-context="'Content/Moderation/Table.Label'">Status</translate>
                       </td>
                       <td>
-                        <translate>Error while fetching node info</translate>&nbsp;
+                        <translate :translate-context="'Content/Moderation/Table'">Error while fetching node info</translate>&nbsp;
 
                         <span :data-tooltip="object.nodeinfo.error"><i class="question circle icon"></i></span>
                       </td>
@@ -133,7 +133,7 @@
                 </tbody>
               </table>
               <ajax-button @action-done="refreshNodeInfo" method="get" :url="'manage/federation/domains/' + object.name + '/nodeinfo/'">
-                <translate>Refresh node info</translate>
+                <translate :translate-context="'Content/Moderation/Button.Label/Verb'">Refresh node info</translate>
               </ajax-button>
             </section>
           </div>
@@ -142,7 +142,7 @@
               <h3 class="ui header">
                 <i class="feed icon"></i>
                 <div class="content">
-                  <translate>Activity</translate>&nbsp;
+                  <translate :translate-context="'Content/Moderation/Title'">Activity</translate>&nbsp;
                   <span :data-tooltip="labels.statsWarning"><i class="question circle icon"></i></span>
 
                 </div>
@@ -159,7 +159,7 @@
                     <td>
                       <router-link
                         :to="{name: 'manage.moderation.accounts.list', query: {q: 'domain:' + object.name }}">
-                        <translate>Known accounts</translate>
+                        <translate :translate-context="'Content/Moderation/Table.Label.Link'">Known accounts</translate>
                         </router-link>
 
                     </td>
@@ -169,7 +169,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Emitted messages</translate>
+                      <translate :translate-context="'Content/Moderation/Table.Label/Noun'">Emitted messages</translate>
                     </td>
                     <td>
                       {{ stats.outbox_activities}}
@@ -177,7 +177,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Received library follows</translate>
+                      <translate :translate-context="'Content/Moderation/Table.Label/Noun'">Received library follows</translate>
                     </td>
                     <td>
                       {{ stats.received_library_follows}}
@@ -185,7 +185,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Emitted library follows</translate>
+                      <translate :translate-context="'Content/Moderation/Table.Label/Noun'">Emitted library follows</translate>
                     </td>
                     <td>
                       {{ stats.emitted_library_follows}}
@@ -200,7 +200,7 @@
               <h3 class="ui header">
                 <i class="music icon"></i>
                 <div class="content">
-                  <translate>Audio content</translate>&nbsp;
+                  <translate :translate-context="'Content/Moderation/Title'">Audio content</translate>&nbsp;
                   <span :data-tooltip="labels.statsWarning"><i class="question circle icon"></i></span>
 
                 </div>
@@ -215,7 +215,7 @@
                 <tbody>
                   <tr>
                     <td>
-                      <translate>Cached size</translate>
+                      <translate :translate-context="'Content/Moderation/Table.Label/Noun'">Cached size</translate>
                     </td>
                     <td>
                       {{ stats.media_downloaded_size | humanSize }}
@@ -223,7 +223,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Total size</translate>
+                      <translate :translate-context="'Content/Moderation/Table.Label'">Total size</translate>
                     </td>
                     <td>
                       {{ stats.media_total_size | humanSize }}
@@ -231,7 +231,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Libraries</translate>
+                      <translate :translate-context="'Content/Moderation/Table.Label'">Libraries</translate>
                     </td>
                     <td>
                       {{ stats.libraries }}
@@ -239,7 +239,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Uploads</translate>
+                      <translate :translate-context="'Content/Moderation/Table.Label/Noun'">Uploads</translate>
                     </td>
                     <td>
                       {{ stats.uploads }}
@@ -247,7 +247,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Artists</translate>
+                      <translate :translate-context="'Content/*/*'">Artists</translate>
                     </td>
                     <td>
                       {{ stats.artists }}
@@ -255,7 +255,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Albums</translate>
+                      <translate :translate-context="'Content/*/*'">Albums</translate>
                     </td>
                     <td>
                       {{ stats.albums}}
@@ -263,7 +263,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <translate>Tracks</translate>
+                      <translate :translate-context="'Content/*/*'">Tracks</translate>
                     </td>
                     <td>
                       {{ stats.tracks }}
@@ -355,7 +355,7 @@ export default {
   computed: {
     labels() {
       return {
-        statsWarning: this.$gettext("Statistics are computed from known activity and content on your instance, and do not reflect general activity for this domain")
+        statsWarning: this.$pgettext('Content/Moderation/Help text', "Statistics are computed from known activity and content on your instance, and do not reflect general activity for this domain")
       }
     },
     externalUrl () {

From 40aec49787e0a7c6e1da881c70e71c2ddb8b1b75 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Sun, 10 Feb 2019 15:25:46 +0100
Subject: [PATCH 3/3] Added translation string context for Notifications.vue

---
 front/src/views/Notifications.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/front/src/views/Notifications.vue b/front/src/views/Notifications.vue
index 98e666943..bee7e5e35 100644
--- a/front/src/views/Notifications.vue
+++ b/front/src/views/Notifications.vue
@@ -2,20 +2,20 @@
   <main class="main pusher" v-title="labels.title">
     <section class="ui vertical aligned stripe segment">
       <div v-if="isLoading" :class="['ui', {'active': isLoading}, 'inverted', 'dimmer']">
-        <div class="ui text loader"><translate>Loading notifications…</translate></div>
+        <div class="ui text loader"><translate :translate-context="'Content/Notifications/Paragraph'">Loading notifications…</translate></div>
       </div>
       <div v-else class="ui container">
-        <h1 class="ui header"><translate>Your notifications</translate></h1>
+        <h1 class="ui header"><translate :translate-context="'Content/Notifications/Title'">Your notifications</translate></h1>
         <div class="ui toggle checkbox">
           <input v-model="filters.is_read" type="checkbox">
-          <label><translate>Show read notifications</translate></label>
+          <label><translate :translate-context="'Content/Notifications/Form.Label/Verb'">Show read notifications</translate></label>
         </div>
         <div
           v-if="filters.is_read === false && notifications.count > 0"
           @click="markAllAsRead"
           class="ui basic labeled icon right floated button">
           <i class="ui check icon" />
-          <translate>Mark all as read</translate>
+          <translate :translate-context="'Content/Notifications/Button.Label/Verb'">Mark all as read</translate>
         </div>
         <div class="ui hidden divider" />
         <table v-if="notifications.count > 0" class="ui table">
@@ -24,7 +24,7 @@
           </tbody>
         </table>
         <p v-else>
-          <translate>No notification to show.</translate>
+          <translate :translate-context="'Content/Notifications/Paragraph'">No notification to show.</translate>
         </p>
       </div>
     </section>
@@ -71,7 +71,7 @@ export default {
     }),
     labels() {
       return {
-        title: this.$gettext("Notifications")
+        title: this.$pgettext('Head/Notifications/Title', "Notifications")
       }
     }
   },