From febabf9303da13c77bdc31a68c1af8823894b6b8 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 12:25:19 +0300
Subject: [PATCH] rename table header translations

---
 .../features/ReportsTable/ReportsTable.vue    | 260 +++++++++---------
 webapp/locales/de.json                        |   8 +-
 webapp/locales/en.json                        |   8 +-
 3 files changed, 134 insertions(+), 142 deletions(-)

diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index 04fd877c5..27dcf43a5 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -15,145 +15,137 @@
     <thead class="ds-table-col ds-table-head-col">
       <tr valign="top">
         <th></th>
-        <th>
-          {{ $t('moderation.reports.contentRowHeadline') }}
-        </th>
-        <th>
-          {{ $t('moderation.reports.authorRowHeadline') }}
-        </th>
-        <th>
-          {{ $t('moderation.reports.typeRowHeadline') }}
-        </th>
-        <th>
-          {{ $t('moderation.reports.decisionRowHeadline') }}
-        </th>
+        <th>{{ $t('moderation.reports.content') }}</th>
+        <th>{{ $t('moderation.reports.author') }}</th>
+        <th>{{ $t('moderation.reports.status') }}</th>
+        <th>{{ $t('moderation.reports.decision') }}</th>
       </tr>
     </thead>
     <tbody>
-    <template v-for="report in reports">
-      <tr :key="report.resource.id" valign="top" :data-test="report.resource.__typename">
-        <td class="ds-table-col">
-          <ds-text color="soft">
-            <base-icon
-              v-if="isPost(report.resource)"
-              v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
-              name="bookmark"
-            />
-            <base-icon
-              v-else-if="isComment(report.resource)"
-              v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
-              name="comments"
-            />
-            <base-icon
-              v-else-if="isUser(report.resource)"
-              v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
-              name="user"
-            />
-          </ds-text>
-        </td>
-        <td class="ds-table-col ">
-          <div v-if="isPost(report.resource) || isComment(report.resource)">
-            <nuxt-link
-              data-test="post-link"
-              :to="{
-                name: 'post-id-slug',
-                params: params(report.resource),
-                hash: hashParam(report.resource),
-              }"
+      <template v-for="report in reports">
+        <tr :key="'1-' + report.resource.id" valign="top" :data-test="report.resource.__typename">
+          <td class="ds-table-col">
+            <ds-text color="soft">
+              <base-icon
+                v-if="isPost(report.resource)"
+                v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
+                name="bookmark"
+              />
+              <base-icon
+                v-else-if="isComment(report.resource)"
+                v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
+                name="comments"
+              />
+              <base-icon
+                v-else-if="isUser(report.resource)"
+                v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
+                name="user"
+              />
+            </ds-text>
+          </td>
+          <td class="ds-table-col ">
+            <div v-if="isPost(report.resource) || isComment(report.resource)">
+              <nuxt-link
+                data-test="post-link"
+                :to="{
+                  name: 'post-id-slug',
+                  params: params(report.resource),
+                  hash: hashParam(report.resource),
+                }"
+              >
+                <b>
+                  {{
+                    report.resource.title ||
+                      $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
+                  }}
+                </b>
+              </nuxt-link>
+            </div>
+            <div v-else>
+              <client-only>
+                <hc-user
+                  :user="report.resource"
+                  :showAvatar="false"
+                  :trunc="30"
+                  :data-test="report.resource.slug"
+                />
+              </client-only>
+            </div>
+          </td>
+          <td class="ds-table-col ">
+            <client-only>
+              <hc-user
+                v-if="report.resource.__typename !== 'User'"
+                :user="report.resource.author"
+                :showAvatar="false"
+                :trunc="30"
+                :data-test="report.resource.author.slug"
+              />
+              <span v-else>—</span>
+            </client-only>
+          </td>
+          <td>
+            <div v-if="report.reviewed">
+              <br />
+              <div v-if="report.resource.disabled" data-test="disabled">
+                <base-icon name="eye-slash" class="ban" />
+                {{ $t('moderation.reports.disabledBy') }}
+              </div>
+              <div v-else data-test="enabled">
+                <base-icon name="eye" class="no-ban" />
+                {{ $t('moderation.reports.enabledBy') }}
+              </div>
+              <client-only>
+                <hc-user
+                  :user="moderatorOfLatestReview(report)"
+                  :showAvatar="false"
+                  :trunc="30"
+                  :date-time="report.updatedAt"
+                  positionDatetime="below"
+                  :data-test="moderatorOfLatestReview(report).slug"
+                />
+              </client-only>
+            </div>
+            <div v-else>
+              <br />
+              <div data-test="unreviewed">
+                <base-icon name="eye" class="no-ban" />
+                {{ $t('moderation.reports.enabled') }}
+              </div>
+            </div>
+          </td>
+          <td class="ds-table-col">
+            <b v-if="report.closed" data-test="closed">
+              {{ $t('moderation.reports.decided') }}
+            </b>
+            <ds-button
+              v-else
+              danger
+              class="confirm"
+              :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
+              @click="confirm(report)"
             >
-              <b>
-                {{
-                  report.resource.title ||
-                    $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
-                }}
-              </b>
-            </nuxt-link>
-          </div>
-          <div v-else>
-            <client-only>
-              <hc-user
-                :user="report.resource"
-                :showAvatar="false"
-                :trunc="30"
-                :data-test="report.resource.slug"
-              />
-            </client-only>
-          </div>
-        </td>
-        <td class="ds-table-col ">
-          <client-only>
-            <hc-user
-              v-if="report.resource.__typename !== 'User'"
-              :user="report.resource.author"
-              :showAvatar="false"
-              :trunc="30"
-              :data-test="report.resource.author.slug"
-            />
-            <span v-else>—</span>
-          </client-only>
-        </td>
-        <td>
-          <div v-if="report.reviewed">
-            <br />
-            <div v-if="report.resource.disabled" data-test="disabled">
-              <base-icon name="eye-slash" class="ban" />
-              {{ $t('moderation.reports.disabledBy') }}
-            </div>
-            <div v-else data-test="enabled">
-              <base-icon name="eye" class="no-ban" />
-              {{ $t('moderation.reports.enabledBy') }}
-            </div>
-            <client-only>
-              <hc-user
-                :user="moderatorOfLatestReview(report)"
-                :showAvatar="false"
-                :trunc="30"
-                :date-time="report.updatedAt"
-                positionDatetime="below"
-                :data-test="moderatorOfLatestReview(report).slug"
-              />
-            </client-only>
-          </div>
-          <div v-else>
-            <br />
-            <div data-test="unreviewed">
-              <base-icon name="eye" class="no-ban" />
-              {{ $t('moderation.reports.enabled') }}
-            </div>
-          </div>
-        </td>
-        <td class="ds-table-col">
-          <b v-if="report.closed" data-test="closed">
-            {{ $t('moderation.reports.decided') }}
-          </b>
-          <ds-button
-            v-else
-            danger
-            class="confirm"
-            :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
-            @click="confirm(report)"
-          >
-            {{ $t('moderation.reports.decideButton') }}
-          </ds-button>
-        </td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          <counter-icon icon="flag" :count="report.filed.length">
-            <ds-button ghost primary @click="showFiledReports = !showFiledReports">
-              {{ $t('moderation.reports.moreDetails') }}
+              {{ $t('moderation.reports.decideButton') }}
             </ds-button>
-          </counter-icon>
-        </td>
-      </tr>
-      <tr>
-        <td class="ds-table-col filed-table" colspan="4">
-          <ds-space margin-bottom="base" />
-          <filed-table :filed="report.filed" v-if="showFiledReports" />
-        </td>
-      </tr>
-    </template>
+          </td>
+        </tr>
+        <tr :key="'2-' + report.resource.id">
+          <td></td>
+          <td>
+            <counter-icon icon="flag" :count="report.filed.length">
+              <ds-button ghost primary @click="showFiledReports = !showFiledReports">
+                {{ $t('moderation.reports.moreDetails') }}
+              </ds-button>
+            </counter-icon>
+          </td>
+        </tr>
+        <tr :key="'3-' + report.resource.id">
+          <td class="ds-table-col filed-table" colspan="4">
+            <ds-space margin-bottom="base" />
+            <filed-table :filed="report.filed" v-if="showFiledReports" />
+          </td>
+        </tr>
+      </template>
     </tbody>
   </table>
   <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index d92bbe0f9..0e754d760 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -316,10 +316,10 @@
         "reports": {
             "empty": "Glückwunsch, es gibt nichts zu moderieren.",
             "name": "Meldungen",
-            "typeRowHeadline": "Aktueller Status",
-            "contentRowHeadline": "Inhalt",
-            "authorRowHeadline": "Autor",
-            "decisionRowHeadline": "Entscheidung",
+            "status": "Aktueller Status",
+            "content": "Inhalt",
+            "author": "Autor",
+            "decision": "Entscheidung",
             "enabled": "Entsperrt",
             "disabled": "Gesperrt",
             "decided": "Entschieden",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 0fe2b8eca..dc73a2d82 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -482,10 +482,10 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
-      "typeRowHeadline": "Current status",
-      "contentRowHeadline": "Content",
-      "authorRowHeadline": "Author",
-      "decisionRowHeadline": "Decision",
+      "status": "Current status",
+      "content": "Content",
+      "author": "Author",
+      "decision": "Decision",
       "enabled": "Enabled",
       "disabled": "Disabled",
       "decided": "Decided",