From 85e9e1da1645232b4537f9f6830d2e1e0c31a12a Mon Sep 17 00:00:00 2001 From: NoriDev Date: Mon, 7 Aug 2023 16:59:10 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=8E=E3=83=BC=E3=83=88=E4=BD=9C?= =?UTF-8?q?=E6=88=90=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AE=E3=80=8C?= =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E3=80=8D=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=82=92=E3=80=8C=E3=81=AB=E3=82=83=E3=82=93=EF=BC=81=E3=80=8D?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=AA?= =?UTF-8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + locales/en-US.yml | 3 +++ locales/index.d.ts | 3 +++ locales/ja-JP.yml | 3 +++ locales/ko-KR.yml | 3 +++ packages/frontend/src/components/MkPostForm.vue | 6 ++++-- packages/frontend/src/pages/settings/cherrypick.vue | 5 +++++ packages/frontend/src/store.ts | 4 ++++ 8 files changed, 26 insertions(+), 2 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 8034a70e7e..c47e18ad1e 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -27,6 +27,7 @@ ### General - 스크롤 시 요소 표시(헤더, 플로팅 버튼, 탐색 모음)를 사용자화 할 수 있는 옵션 추가 +- 노트 작성 폼의 "노트" 버튼을 "냥!"으로 변경할 수 있는 옵션 추가 ### Client - 이모티콘 피커의 검색 건수를 100개로 증가 (misskey-dev/misskey#11371) diff --git a/locales/en-US.yml b/locales/en-US.yml index 4c623c94b4..ffe2bc4ca8 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1,5 +1,6 @@ --- _lang_: "English" +nya: "Nyan!" displayHeaderNavBarWhenScroll: "Show elements when scrolling (header, floating buttons, navigation bar)" addSingle: "Add just one" addMultiple: "Add multiple" @@ -1175,6 +1176,8 @@ _cherrypick: reactableRemoteReaction: "Allow remote custom emoji reactions to react if there is an emoji with the same name on this server." showFollowingMessageInsteadOfButton: "Do not show the follow button in the notification field if you are already following someone" mobileTimelineHeaderChange: "Timeline header design change in mobile environment" + renameTheButtonInPostFormToNya: "Change the \"Note\" button on the note-posting form to \"Nyan!\"" + renameTheButtonInPostFormToNyaDescription: "Outside of the note-posting form, they are still as \"Note\"." _displayHeaderNavBarWhenScroll: all: "Display all" hideHeaderOnly: "Hide header only" diff --git a/locales/index.d.ts b/locales/index.d.ts index fcf40463d1..7dcc7c84d2 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -3,6 +3,7 @@ // Do not edit this file directly. export interface Locale { "_lang_": string; + "nya": string; "displayHeaderNavBarWhenScroll": string; "addSingle": string; "addMultiple": string; @@ -1179,6 +1180,8 @@ export interface Locale { "reactableRemoteReaction": string; "showFollowingMessageInsteadOfButton": string; "mobileTimelineHeaderChange": string; + "renameTheButtonInPostFormToNya": string; + "renameTheButtonInPostFormToNyaDescription": string; }; "_displayHeaderNavBarWhenScroll": { "all": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 8f58ec24d2..ee69e4928f 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1,5 +1,6 @@ _lang_: "日本語" +nya: "にゃん！" displayHeaderNavBarWhenScroll: "スクロール時の要素表示（ヘッダー、フローティングボタン、ナビゲーションバー）" addSingle: "一つだけ追加" addMultiple: "複数追加" @@ -1177,6 +1178,8 @@ _cherrypick: reactableRemoteReaction: "リモートのカスタム絵文字リアクションでも、このサーバーに同じ名前の絵文字があればリアクションできるようにする" showFollowingMessageInsteadOfButton: "既にフォローしている場合、通知欄にフォローボタンを表示しない" mobileTimelineHeaderChange: "モバイル環境でタイムラインのヘッダーデザインを変更" + renameTheButtonInPostFormToNya: "ノート作成画面の「ノート」ボタンを「にゃ！」に変更する" + renameTheButtonInPostFormToNyaDescription: "にゃあにゃんにゃんにゃんにゃにゃん？" _displayHeaderNavBarWhenScroll: all: "全て表示" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 58e7fce19f..6085047e91 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1,5 +1,6 @@ --- _lang_: "한국어" +nya: "냥!" displayHeaderNavBarWhenScroll: "스크롤 시 요소 표시 (헤더, 플로팅 버튼, 탐색 모음)" addSingle: "하나만 추가" addMultiple: "여러 개 추가" @@ -1173,6 +1174,8 @@ _cherrypick: reactableRemoteReaction: "서버에 리모트 이모지와 이름이 같은 이모지가 있으면 리모트 이모지에도 반응할 수 있음" showFollowingMessageInsteadOfButton: "이미 팔로우한 경우 알림 필드에 팔로우 버튼을 표시하지 않음" mobileTimelineHeaderChange: "모바일 환경에서 타임라인의 헤더 디자인을 변경" + renameTheButtonInPostFormToNya: "노트 작성 화면의 \"노트\" 버튼을 \"냥!\"으로 변경" + renameTheButtonInPostFormToNyaDescription: "냐앙냥냥냥냐냥?" _displayHeaderNavBarWhenScroll: all: "모두 표시" hideHeaderOnly: "헤더만 숨기기" diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index b97b11b16f..1a87ae2978 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -46,7 +46,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -238,7 +238,9 @@ const submitText = $computed((): string => { ? i18n.ts.quote : props.reply ? i18n.ts.reply - : i18n.ts.note; + : defaultStore.state.renameTheButtonInPostFormToNya + ? i18n.ts.nya + : i18n.ts.note; }); const textLength = $computed((): number => { diff --git a/packages/frontend/src/pages/settings/cherrypick.vue b/packages/frontend/src/pages/settings/cherrypick.vue index 43fa968529..6398b6ad49 100644 --- a/packages/frontend/src/pages/settings/cherrypick.vue +++ b/packages/frontend/src/pages/settings/cherrypick.vue @@ -55,6 +55,10 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._cherrypick.reactableRemoteReaction }} {{ i18n.ts._cherrypick.showFollowingMessageInsteadOfButton }} {{ i18n.ts._cherrypick.mobileTimelineHeaderChange }} + + {{ i18n.ts._cherrypick.renameTheButtonInPostFormToNya }} + + @@ -91,6 +95,7 @@ const rememberPostFormToggleStateEnabled = computed(defaultStore.makeGetterSette const showFollowingMessageInsteadOfButtonEnabled = computed(defaultStore.makeGetterSetter('showFollowingMessageInsteadOfButtonEnabled')); const mobileTimelineHeaderChange = computed(defaultStore.makeGetterSetter('mobileTimelineHeaderChange')); const displayHeaderNavBarWhenScroll = computed(defaultStore.makeGetterSetter('displayHeaderNavBarWhenScroll')); +const renameTheButtonInPostFormToNya = computed(defaultStore.makeGetterSetter('renameTheButtonInPostFormToNya')); watch([ infoButtonForNoteActionsEnabled, diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 58d66d560b..c09c807a9e 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -476,6 +476,10 @@ export const defaultStore = markRaw(new Storage('base', { where: 'device', default: false, }, + renameTheButtonInPostFormToNya: { + where: 'device', + default: false, + }, // - etc friendlyEnableNotifications: {