From 2fb31a520a4bdb4f2654c3c5ee8b85e04da8d065 Mon Sep 17 00:00:00 2001 From: Ryosei <116582524+rainy6@users.noreply.github.com> Date: Sun, 6 Aug 2023 11:34:56 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E3=83=89=E3=83=A9=E3=82=A4=E3=83=96=20?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=82=92=E7=A2=BA=E8=AA=8D=E3=81=99=E3=82=8B=E3=83=80=E3=82=A4?= =?UTF-8?q?=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=8C=E8=AA=A4=E8=A7=A3=E3=82=92?= =?UTF-8?q?=E6=8B=9B=E3=81=8F=20(#11465)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix:ドライブ ファイルの削除を確認するダイアログが誤解を招く * fix:ドライブのファイル削除メッセージ修正（全て→一部） --- locales/ja-JP.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index a91b919e6e..cab5c8f97a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -74,7 +74,7 @@ import: "インポート" export: "エクスポート" files: "ファイル" download: "ダウンロード" -driveFileDeleteConfirm: "ファイル「{name}」を削除しますか？このファイルを使用した全てのコンテンツからも削除されます。" +driveFileDeleteConfirm: "ファイル「{name}」を削除しますか？このファイルを使用した一部のコンテンツも削除されます。" unfollowConfirm: "{name}のフォローを解除しますか？" exportRequested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、「ドライブ」に追加されます。" importRequested: "インポートをリクエストしました。これには時間がかかる場合があります。" From 1d557089e935d8266c2ad8e5e71251da26d78b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sun, 6 Aug 2023 11:46:19 +0900 Subject: [PATCH 2/4] Delete Misskey Forum (Issue template) (#11475) --- .github/ISSUE_TEMPLATE/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 730647b086..e8b65dc3b9 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,4 @@ contact_links: - - name: 👪 Misskey Forum - url: https://forum.misskey.io/ - about: Ask questions and share knowledge - name: 💬 Misskey official Discord url: https://discord.gg/Wp8gVStHW3 about: Chat freely about Misskey From 722a731c267bdb647c1a0b532c053fb70d3b72d6 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 6 Aug 2023 12:15:28 +0000 Subject: [PATCH 3/4] chore: Increase displayLimit in about.federation.vue https://github.com/misskey-dev/misskey/issues/11355#issuecomment-1666823238 --- packages/frontend/src/pages/about.federation.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue index 1798d7525e..0796553338 100644 --- a/packages/frontend/src/pages/about.federation.vue +++ b/packages/frontend/src/pages/about.federation.vue @@ -64,6 +64,7 @@ let sort = $ref('+pubSub'); const pagination = { endpoint: 'federation/instances' as const, limit: 10, + displatLimit: 50, offsetMode: true, params: computed(() => ({ sort: sort, From db5046ed3a6b156094f2863b3941854865c25214 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 6 Aug 2023 12:16:49 +0000 Subject: [PATCH 4/4] fix typo --- packages/frontend/src/pages/about.federation.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue index 0796553338..0c40656058 100644 --- a/packages/frontend/src/pages/about.federation.vue +++ b/packages/frontend/src/pages/about.federation.vue @@ -53,7 +53,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { computed } from 'vue'; import MkInput from '@/components/MkInput.vue'; import MkSelect from '@/components/MkSelect.vue'; -import MkPagination from '@/components/MkPagination.vue'; +import MkPagination, { Paging } from '@/components/MkPagination.vue'; import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue'; import FormSplit from '@/components/form/split.vue'; import { i18n } from '@/i18n'; @@ -64,7 +64,7 @@ let sort = $ref('+pubSub'); const pagination = { endpoint: 'federation/instances' as const, limit: 10, - displatLimit: 50, + displayLimit: 50, offsetMode: true, params: computed(() => ({ sort: sort, @@ -78,7 +78,7 @@ const pagination = { state === 'notResponding' ? { notResponding: true } : {}), })), -}; +} as Paging; function getStatus(instance) { if (instance.isSuspended) return 'Suspended';