diff --git a/locales/en-US.yml b/locales/en-US.yml index 7e9d6849e3..b2be2a6f96 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -105,7 +105,7 @@ copyLinkRenote: "Copy renote link" delete: "Delete" deleteAndEdit: "Delete and edit" deleteAndEditConfirm: "Are you sure you want to redraft this note? This means you will lose all reactions, renotes, and replies to it." -copyAndEdit: "Copy and edit" +copyAndEdit: "Copy and edit content" copyAndEditConfirm: "Are you sure you want to copy this note and edit it? The media included in the notes are also copied." addToList: "Add to list" addToAntenna: "Add to antenna" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 7cc8de33de..7d740881b9 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -105,7 +105,7 @@ copyLinkRenote: "リノートのリンクをコピー" delete: "削除" deleteAndEdit: "削除して編集" deleteAndEditConfirm: "このノートを削除してもう一度編集しますか?このノートへのリアクション、リノート、返信も全て削除されます。" -copyAndEdit: "コピーして編集" +copyAndEdit: "内容をコピーして編集" copyAndEditConfirm: "このノートをコピーして編集しましょうか?ノートに含まれているメディアも一緒にコピーされます。" addToList: "リストに追加" addToAntenna: "アンテナに追加" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index ba3059bd3b..b948f9389b 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -105,7 +105,7 @@ copyLinkRenote: "리노트 링크 복사" delete: "삭제" deleteAndEdit: "삭제 후 편집" deleteAndEditConfirm: "이 노트를 삭제한 뒤 다시 편집할까요? 이 노트에 달린 리액션, 리노트, 그리고 답글이 모두 삭제돼요!" -copyAndEdit: "복사 후 편집" +copyAndEdit: "내용 복사 후 편집" copyAndEditConfirm: "이 노트를 복사하고 편집할까요? 노트에 포함된 미디어도 같이 복사돼요!" addToList: "리스트에 추가" addToAntenna: "안테나에 추가" diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index 3a639d0e74..2ff1345e3b 100644 --- a/packages/frontend/src/scripts/get-note-menu.ts +++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -347,23 +347,13 @@ export function getNoteMenu(props: { text: i18n.ts.copyContent, action: copyContent, }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink) - , (appearNote.url || appearNote.uri) ? { + , (appearNote.url ?? appearNote.uri) ? { icon: 'ti ti-external-link', text: i18n.ts.showOnRemote, action: () => { window.open(appearNote.url ?? appearNote.uri, '_blank'); }, } : undefined, - (appearNote.userId === $i.id) ? { - icon: 'ti ti-edit', - text: i18n.ts.copyAndEdit, - action: copyEdit, - } : undefined, - appearNote.userId === $i.id ? { - icon: 'ti ti-edit', - text: i18n.ts.deleteAndEdit, - action: delEdit, - } : undefined, { icon: 'ti ti-share', text: i18n.ts.share, @@ -375,6 +365,17 @@ export function getNoteMenu(props: { action: translate, } : undefined, null, + (appearNote.userId === $i.id) ? { + icon: 'ti ti-edit', + text: i18n.ts.copyAndEdit, + action: copyEdit, + } : undefined, + appearNote.userId === $i.id ? { + icon: 'ti ti-edit', + text: i18n.ts.deleteAndEdit, + action: delEdit, + } : undefined, + null, { icon: 'ti ti-file-text', text: i18n.ts.viewTextSource,