From ec092579a62d4b6237e1214add3f484e4c5097da Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 24 Feb 2023 09:14:58 +0900 Subject: [PATCH 1/8] Update CONTRIBUTING.md --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a8322d7b92..668989f122 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -88,6 +88,13 @@ An actual domain will be assigned so you can test the federation. - The target branch must be `master` - The tag name must be the version +> **Note** +> Why this instruction is necessary: +> - To perform final QA checks +> - To distribute responsibility +> - To check direct commits to develop +> - To celebrate the release together 🎉 + ## Localization (l10n) Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management. You can improve our translations with your Crowdin account. From ff8437c378d4a65e13a6e9d4ff09820ae846e5bf Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 24 Feb 2023 10:24:25 +0900 Subject: [PATCH 2/8] =?UTF-8?q?enhance(client):=20=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=82=AB=E3=83=AB=E3=81=AE=E3=81=BF=20->=20=E9=80=A3=E5=90=88?= =?UTF-8?q?=E3=81=AA=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve #10055 --- CHANGELOG.md | 3 +++ locales/ja-JP.yml | 5 +++-- packages/frontend/src/components/MkNote.vue | 2 +- packages/frontend/src/components/MkNoteDetailed.vue | 4 ++-- packages/frontend/src/components/MkNoteHeader.vue | 2 +- packages/frontend/src/components/MkPostForm.vue | 5 +++++ packages/frontend/src/components/MkVisibilityPicker.vue | 4 ++-- packages/frontend/src/pages/settings/privacy.vue | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 192f605168..d75f1f3376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ You should also include the user name that made the change. ### Note 13.7.0以前から直接このバージョンにアップデートする場合は全ての通知が削除**されません。** +### Improvements +- 紛らわしいため公開範囲の「ローカルのみ」オプションの名称を「連合なし」に変更 + ### Bugfixes - 全ての通知が削除されてしまうのを修正 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5ba5f64769..8a04309360 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -949,6 +949,7 @@ copyErrorInfo: "エラー情報をコピー" joinThisServer: "このサーバーに登録する" exploreOtherServers: "他のサーバーを探す" letsLookAtTimeline: "タイムラインを見てみる" +disableFederationWarn: "連合が無効になっています。無効にしても投稿が非公開にはなりません。ほとんどの場合、このオプションを有効にする必要はありません。" _achievements: earnedAt: "獲得日時" @@ -1677,8 +1678,8 @@ _visibility: followersDescription: "自分のフォロワーのみに公開" specified: "ダイレクト" specifiedDescription: "指定したユーザーのみに公開" - localOnly: "ローカルのみ" - localOnlyDescription: "リモートユーザーには非公開" + disableFederation: "連合なし" + disableFederationDescription: "他インスタンスへの配信を行いません" _postForm: replyPlaceholder: "このノートに返信..." diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 6ed3ee51f5..ffc3133a85 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -31,7 +31,7 @@ - +
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 82e0f3e689..3ec1ce95f4 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -30,7 +30,7 @@ - +
@@ -48,7 +48,7 @@ - +
diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue index 32998e1a70..ffd9a20ef7 100644 --- a/packages/frontend/src/components/MkNoteHeader.vue +++ b/packages/frontend/src/components/MkNoteHeader.vue @@ -17,7 +17,7 @@ - + diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 54512aa4d8..f73eab5b86 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -45,6 +45,7 @@ + {{ i18n.ts.disableFederationWarn }} {{ i18n.ts.notSpecifiedMentionWarning }} -