From cced83024bfb578ee802ab13fc8af72a1be9a1e1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 15 Aug 2021 20:26:44 +0900
Subject: feat: ノートの翻訳機能
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve #5213
---
 src/client/pages/instance/other-settings.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/client/pages/instance')

diff --git a/src/client/pages/instance/other-settings.vue b/src/client/pages/instance/other-settings.vue
index b3954149a8..8002528931 100644
--- a/src/client/pages/instance/other-settings.vue
+++ b/src/client/pages/instance/other-settings.vue
@@ -7,7 +7,12 @@
 				Summaly Proxy URL
 			</FormInput>
 		</FormGroup>
-
+		<FormGroup>
+			<FormInput v-model:value="deeplAuthKey">
+				<template #prefix><i class="fas fa-key"></i></template>
+				DeepL Auth Key
+			</FormInput>
+		</FormGroup>
 		<FormButton @click="save" primary><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
 	</FormSuspense>
 </FormBase>
@@ -44,6 +49,7 @@ export default defineComponent({
 				icon: 'fas fa-cogs'
 			},
 			summalyProxy: '',
+			deeplAuthKey: '',
 		}
 	},
 
@@ -55,10 +61,12 @@ export default defineComponent({
 		async init() {
 			const meta = await os.api('meta', { detail: true });
 			this.summalyProxy = meta.summalyProxy;
+			this.deeplAuthKey = meta.deeplAuthKey;
 		},
 		save() {
 			os.apiWithDialog('admin/update-meta', {
 				summalyProxy: this.summalyProxy,
+				deeplAuthKey: this.deeplAuthKey,
 			}).then(() => {
 				fetchInstance();
 			});
-- 
cgit v1.2.3-freya


From b5cadeca2e02f88d46625f27c3fcc796e45c2526 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 16 Aug 2021 20:07:54 +0900
Subject: fix(client): コントロールパネルでファイルを削除した際の表示を修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #7631
---
 CHANGELOG.md                              | 1 +
 src/client/pages/instance/file-dialog.vue | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/client/pages/instance')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 066e8677be..74b24dda70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 ### Bugfixes
 - タッチ操作でウィンドウを閉じることができない問題を修正
 - Renoteされた時刻が投稿された時刻のように表示される問題を修正
+- コントロールパネルでファイルを削除した際の表示を修正
 - ActivityPub: 長いユーザーの名前や自己紹介の対応
 
 ## 12.87.0 (2021/08/12)
diff --git a/src/client/pages/instance/file-dialog.vue b/src/client/pages/instance/file-dialog.vue
index be6bf6cbf2..8a03a11de7 100644
--- a/src/client/pages/instance/file-dialog.vue
+++ b/src/client/pages/instance/file-dialog.vue
@@ -93,10 +93,8 @@ export default defineComponent({
 			});
 			if (canceled) return;
 
-			os.api('drive/files/delete', {
+			os.apiWithDialog('drive/files/delete', {
 				fileId: this.file.id
-			}).then(() => {
-				this.$refs.files.removeItem(x => x.id === this.file.id);
 			});
 		},
 
-- 
cgit v1.2.3-freya