diff --git a/CHANGELOG.md b/CHANGELOG.md index 192f6051689325708867b9a0b8eb49b61279c48f..d75f1f3376e9aa9d21caf59b3aba38f90c9530ca 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 5ba5f647696d1604de087ae1e33c11c11e44b9d6..8a0430936046c95c9a4576a90060beba2596c293 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 6ed3ee51f553031fe6e45b2b5dfbd6b73e228a98..ffc3133a85b016c37933a63fab804166616ad50d 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -31,7 +31,7 @@ <i v-else-if="note.visibility === 'followers'" class="ti ti-lock"></i> <i v-else-if="note.visibility === 'specified'" ref="specified" class="ti ti-mail"></i> </span> - <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['localOnly']"><i class="ti ti-world-off"></i></span> + <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-world-off"></i></span> </div> </div> <div v-if="renoteCollapsed" :class="$style.collapsedRenoteTarget"> diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 82e0f3e689c9ed126d2510ce64182ee828c3ab19..3ec1ce95f43a12f03872694ddbccbc078dbaae69 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -30,7 +30,7 @@ <i v-else-if="note.visibility === 'followers'" class="ti ti-lock"></i> <i v-else-if="note.visibility === 'specified'" ref="specified" class="ti ti-mail"></i> </span> - <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['localOnly']"><i class="ti ti-world-off"></i></span> + <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-world-off"></i></span> </div> </div> <article class="article" @contextmenu.stop="onContextmenu"> @@ -48,7 +48,7 @@ <i v-else-if="appearNote.visibility === 'followers'" class="ti ti-lock"></i> <i v-else-if="appearNote.visibility === 'specified'" ref="specified" class="ti ti-mail"></i> </span> - <span v-if="appearNote.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['localOnly']"><i class="ti ti-world-off"></i></span> + <span v-if="appearNote.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-world-off"></i></span> </div> </div> <div class="username"><MkAcct :user="appearNote.user"/></div> diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue index 32998e1a704dd788b1f40443a918242ce893e907..ffd9a20ef7e6f041e99af79ba5c17e545f371881 100644 --- a/packages/frontend/src/components/MkNoteHeader.vue +++ b/packages/frontend/src/components/MkNoteHeader.vue @@ -17,7 +17,7 @@ <i v-else-if="note.visibility === 'followers'" class="ti ti-lock"></i> <i v-else-if="note.visibility === 'specified'" ref="specified" class="ti ti-mail"></i> </span> - <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['localOnly']"><i class="ti ti-world-off"></i></span> + <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-world-off"></i></span> </div> </header> </template> diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 54512aa4d8055afe02724b2a59c595a9d9b8e880..f73eab5b86ae8bf1117ef786a6629acfd58fe251 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -45,6 +45,7 @@ <button class="_buttonPrimary" style="padding: 4px; border-radius: 8px;" @click="addVisibleUser"><i class="ti ti-plus ti-fw"></i></button> </div> </div> + <MkInfo v-if="localOnly && channel == null" warn :class="$style.disableFederationWarn">{{ i18n.ts.disableFederationWarn }}</MkInfo> <MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo> <input v-show="useCw" ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown"> <textarea ref="textareaEl" v-model="text" :class="[$style.text, { [$style.withCw]: useCw }]" :disabled="posting || posted" :placeholder="placeholder" data-cy-post-form-text @keydown="onKeydown" @paste="onPaste" @compositionupdate="onCompositionUpdate" @compositionend="onCompositionEnd"/> @@ -941,6 +942,10 @@ defineExpose({ background: var(--X4); } +.disableFederationWarn { + margin: 0 20px 16px 20px; +} + .hasNotSpecifiedMentions { margin: 0 20px 16px 20px; } diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue index 516b88c13d6dc463ab939bc0d77d42f5bb84ff47..703c75c7d07877b09595e4109fd18432460055aa 100644 --- a/packages/frontend/src/components/MkVisibilityPicker.vue +++ b/packages/frontend/src/components/MkVisibilityPicker.vue @@ -33,8 +33,8 @@ <button key="localOnly" class="_button" :class="[$style.item, $style.localOnly, { [$style.active]: localOnly }]" data-index="5" @click="localOnly = !localOnly"> <div :class="$style.icon"><i class="ti ti-world-off"></i></div> <div :class="$style.body"> - <span :class="$style.itemTitle">{{ i18n.ts._visibility.localOnly }}</span> - <span :class="$style.itemDescription">{{ i18n.ts._visibility.localOnlyDescription }}</span> + <span :class="$style.itemTitle">{{ i18n.ts._visibility.disableFederation }}</span> + <span :class="$style.itemDescription">{{ i18n.ts._visibility.disableFederationDescription }}</span> </div> <div :class="$style.toggle"><i :class="localOnly ? 'ti ti-toggle-right' : 'ti ti-toggle-left'"></i></div> </button> diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue index 5692ce80cbeb40bf4806c13b4d47743cc9f735d7..c83c48d5ad58d2212552a255cdbd0bd57c80e254 100644 --- a/packages/frontend/src/pages/settings/privacy.vue +++ b/packages/frontend/src/pages/settings/privacy.vue @@ -46,7 +46,7 @@ <option value="followers">{{ i18n.ts._visibility.followers }}</option> <option value="specified">{{ i18n.ts._visibility.specified }}</option> </MkSelect> - <MkSwitch v-model="defaultNoteLocalOnly">{{ i18n.ts._visibility.localOnly }}</MkSwitch> + <MkSwitch v-model="defaultNoteLocalOnly">{{ i18n.ts._visibility.disableFederation }}</MkSwitch> </div> </MkFolder> </div>