From 7364fb84ef0d4939c4f4173c21ce58184a9d17e9 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 4 Sep 2021 11:21:45 +0200
Subject: [PATCH] fix missing strings (#7674)

* fix sort menu in federation panel

* add missing strings in report menu

* change i18n key too
---
 locales/en-US.yml               |  4 ++++
 locales/ja-JP.yml               |  4 ++++
 src/client/pages/federation.vue | 12 ++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 5a0ebd366c..226a39f91a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -780,6 +780,10 @@ translatedFrom: "Translated from {x}"
 accountDeletionInProgress: "Account deletion is currently in progress"
 usernameInfo: "A name that identifies your account from others on this server.  You can use the alphabet (a~z, A~Z), digits (0~9) or underscores (_). Usernames can not be changed later."
 keepCw: "Keep Content Warning"
+pubSub: "Pub/Sub Accounts"
+lastCommunication: "Last communication"
+resolved: "Resolved"
+unresolved: "Unresolved"
 _accountDelete:
   accountDelete: "Delete Account"
   mayTakeTime: "As account deletion is a resource-heavy process, it may take some time to complete depending on how much content you have created and how many files you have uploaded."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 428cfc1fd6..e22f50668f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -781,6 +781,10 @@ accountDeletionInProgress: "アカウントの削除が進行中です"
 usernameInfo: "サーバー上であなたのアカウントを一意に識別するための名前。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できます。ユーザー名は後から変更することは出来ません。"
 aiChanMode: "藍モード"
 keepCw: "CWを維持する"
+pubSub: "Pub/Subのアカウント"
+lastCommunication: "直近の通信"
+resolved: "解決済み"
+unresolved: "未解決"
 
 _accountDelete:
   accountDelete: "アカウントの削除"
diff --git a/src/client/pages/federation.vue b/src/client/pages/federation.vue
index f4ab9d0ec3..2afe70eea6 100644
--- a/src/client/pages/federation.vue
+++ b/src/client/pages/federation.vue
@@ -28,14 +28,14 @@
 				<option value="-following">{{ $ts.following }} ({{ $ts.ascendingOrder }})</option>
 				<option value="+followers">{{ $ts.followers }} ({{ $ts.descendingOrder }})</option>
 				<option value="-followers">{{ $ts.followers }} ({{ $ts.ascendingOrder }})</option>
-				<option value="+caughtAt">{{ $ts.caughtAt }} ({{ $ts.descendingOrder }})</option>
-				<option value="-caughtAt">{{ $ts.caughtAt }} ({{ $ts.ascendingOrder }})</option>
-				<option value="+lastCommunicatedAt">{{ $ts.lastCommunicatedAt }} ({{ $ts.descendingOrder }})</option>
-				<option value="-lastCommunicatedAt">{{ $ts.lastCommunicatedAt }} ({{ $ts.ascendingOrder }})</option>
+				<option value="+caughtAt">{{ $ts.registeredAt }} ({{ $ts.descendingOrder }})</option>
+				<option value="-caughtAt">{{ $ts.registeredAt }} ({{ $ts.ascendingOrder }})</option>
+				<option value="+lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.descendingOrder }})</option>
+				<option value="-lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.ascendingOrder }})</option>
 				<option value="+driveUsage">{{ $ts.driveUsage }} ({{ $ts.descendingOrder }})</option>
 				<option value="-driveUsage">{{ $ts.driveUsage }} ({{ $ts.ascendingOrder }})</option>
-				<option value="+driveFiles">{{ $ts.driveFiles }} ({{ $ts.descendingOrder }})</option>
-				<option value="-driveFiles">{{ $ts.driveFiles }} ({{ $ts.ascendingOrder }})</option>
+				<option value="+driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.descendingOrder }})</option>
+				<option value="-driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.ascendingOrder }})</option>
 			</MkSelect>
 		</div>
 	</div>
-- 
GitLab