summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-03-16 01:20:13 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-03-16 01:20:13 +0900
commit550517bbf3954a5410c5c7de9e80f2c364d7bf71 (patch)
tree1f65b98f49aef5ec98950c219ec54212c70bd294
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadmisskey-550517bbf3954a5410c5c7de9e80f2c364d7bf71.tar.gz
misskey-550517bbf3954a5410c5c7de9e80f2c364d7bf71.tar.bz2
misskey-550517bbf3954a5410c5c7de9e80f2c364d7bf71.zip
Resolve #4506
-rw-r--r--locales/ja-JP.yml5
-rw-r--r--src/client/app/admin/views/federation.vue21
2 files changed, 18 insertions, 8 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0d8176058b..7f9651b69a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1408,12 +1408,13 @@ admin/views/hashtags.vue:
hided-tags: "Hidden Tags"
admin/views/federation.vue:
- federation: "連合"
+ instance: "インスタンス"
host: "ホスト"
notes: "投稿"
users: "ユーザー"
following: "フォロー中"
followers: "フォロワー"
+ caught-at: "登録日時"
status: "ステータス"
latest-request-sent-at: "直近のリクエスト送信"
latest-request-received-at: "直近のリクエスト受信"
@@ -1422,7 +1423,7 @@ admin/views/federation.vue:
block: "ブロック"
marked-as-closed: "閉鎖されているとマーク"
lookup: "照会"
- instances: "インスタンス"
+ instances: "連合"
instance-not-registered: "そのインスタンスは登録されていません"
sort: "ソート"
sorts:
diff --git a/src/client/app/admin/views/federation.vue b/src/client/app/admin/views/federation.vue
index 69d046cfce..729c5b02b8 100644
--- a/src/client/app/admin/views/federation.vue
+++ b/src/client/app/admin/views/federation.vue
@@ -1,7 +1,7 @@
<template>
<div>
<ui-card>
- <template #title><fa :icon="faTerminal"/> {{ $t('federation') }}</template>
+ <template #title><fa :icon="faTerminal"/> {{ $t('instance') }}</template>
<section class="fit-top">
<ui-input class="target" v-model="target" type="text" @enter="showInstance()">
<span>{{ $t('host') }}</span>
@@ -9,9 +9,14 @@
<ui-button @click="showInstance()"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
<div class="instance" v-if="instance">
- <ui-input :value="instance.host" type="text" readonly>
- <span>{{ $t('host') }}</span>
- </ui-input>
+ <ui-horizon-group inputs>
+ <ui-input :value="instance.host" type="text" readonly>
+ <span>{{ $t('host') }}</span>
+ </ui-input>
+ <ui-input :value="instance.caughtAt | date" type="text" readonly>
+ <span>{{ $t('caught-at') }}</span>
+ </ui-input>
+ </ui-horizon-group>
<ui-horizon-group inputs>
<ui-input :value="instance.notesCount | number" type="text" readonly>
<span>{{ $t('notes') }}</span>
@@ -29,14 +34,14 @@
</ui-input>
</ui-horizon-group>
<ui-horizon-group inputs>
- <ui-input :value="instance.latestRequestSentAt" type="text" readonly>
+ <ui-input :value="instance.latestRequestSentAt | date" type="text" readonly>
<span>{{ $t('latest-request-sent-at') }}</span>
</ui-input>
<ui-input :value="instance.latestStatus" type="text" readonly>
<span>{{ $t('status') }}</span>
</ui-input>
</ui-horizon-group>
- <ui-input :value="instance.latestRequestReceivedAt" type="text" readonly>
+ <ui-input :value="instance.latestRequestReceivedAt | date" type="text" readonly>
<span>{{ $t('latest-request-received-at') }}</span>
</ui-input>
<ui-switch v-model="instance.isBlocked" @change="updateInstance()">{{ $t('block') }}</ui-switch>
@@ -144,6 +149,10 @@ const negate = arr => arr.map(x => -x);
export default Vue.extend({
i18n: i18n('admin/views/federation.vue'),
+ filters: {
+ date: v => v ? new Date(v).toLocaleString() : 'N/A'
+ },
+
data() {
return {
instance: null,