From f60d9da614d02aeea80fba2c7542d6b1ea600dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Fri, 17 Jan 2025 16:48:54 +0900 Subject: [PATCH] =?UTF-8?q?chore(frontend):=20=E9=80=9A=E5=A0=B1=E3=81=AE?= =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=81=AE=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=E3=83=BB=E6=8A=95=E7=A8=BF=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=AE=E3=82=AC=E3=82=A4=E3=83=89=E3=83=A9=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=81=B8=E3=81=AE=E5=B0=8E=E7=B7=9A=E3=81=AB=E5=88=A9=E7=94=A8?= =?UTF-8?q?=E8=A6=8F=E7=B4=84=E3=82=82=E8=BF=BD=E5=8A=A0=20(MisskeyIO#902)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en-US.yml | 7 ++++--- locales/index.d.ts | 11 ++++++----- locales/ja-JP.yml | 8 ++++---- locales/ko-KR.yml | 7 ++++--- packages/frontend/src/components/MkPostForm.vue | 10 +++------- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 3ec46cc61..00f348ceb 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1365,8 +1365,8 @@ _abuseReportCategory: otherBreach_description: "Other actions that violate the terms but do not fall under specific categories" violationRights: "Rights Infringement or Impersonation (Reported by Rights Holder)" violationRights_description: "Posts infringing the rights (such as copyright or trademark) of the rights holder or impersonation" - violationRightsOther: "Rights Infringement or Impersonation (Reported by Third Party)" - violationRightsOther_description: "Posts infringing the rights (such as copyright or trademark) of others or impersonation\nIf reported by a third party, cases outside the scope of non-complaint offenses as defined by law may not be addressed" + violationRightsOther: "Rights Infringement (Reported by Third Party)" + violationRightsOther_description: "Posts infringing the rights (such as copyright or trademark) of others\nIf reported by a third party, cases outside the scope of non-complaint offenses as defined by law may not be addressed" notLike: "Dislike This Person" notLike_description: "Users or posts that you find unpleasant for personal reasons" other: "Other" @@ -2324,6 +2324,7 @@ _postForm: d: "What do you want to say?" e: "Start writing..." f: "Waiting for you to write..." + tosAndGuidelinesInfo: "Before posting, please read the [Terms of Service]({tosUrl}) and [NSFW Guidelines](https://go.misskey.io/media-guideline)." _profile: name: "Name" username: "Username" @@ -2348,7 +2349,7 @@ _profile: sectionName: "Section name" sectionNameNoneDescription: "Do not display the section name" sectionNameNone: "Section without name" - policyDisplayLimitExceeded: "The number of items displayed exceeds the current support plan's limit ({max}). This item will not be displayed. You can upgrade your plan [here](https://go.misskey.io/donate)." + policyDisplayLimitExceeded: "The number of items displayed exceeds the current support plan's limit ({max}). This item will not be displayed.\nYou can upgrade your plan [here](https://go.misskey.io/donate)." _exportOrImport: allNotes: "All notes" favoritedNotes: "Favorite notes" diff --git a/locales/index.d.ts b/locales/index.d.ts index 707e058e8..757baea22 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5490,11 +5490,11 @@ export interface Locale extends ILocale { */ "violationRights_description": string; /** - * 権利侵害やなりすまし（第三者による通報） + * 権利侵害（第三者による通報） */ "violationRightsOther": string; /** - * 他人の著作権、商標権、またはその他の権利を侵害する投稿及びなりすまし行為 + * 他人の著作権、商標権、またはその他の権利を侵害する行為 * 第三者による通報の場合、法律で定められた非親告罪の範囲外のケースには対応できないことがあります */ "violationRightsOther_description": string; @@ -9068,9 +9068,9 @@ export interface Locale extends ILocale { "f": string; }; /** - * [NSFWガイドライン]({nsfwGuideUrl})を必ずお読みになってからご利用ください。 + * 投稿する前に、[利用規約]({tosUrl})と[NSFWガイドライン](https://go.misskey.io/media-guideline)を必ずお読みください。 */ - "guidelineInfo": ParameterizedString<"nsfwGuideUrl">; + "tosAndGuidelinesInfo": ParameterizedString<"tosUrl">; }; "_profile": { /** @@ -9166,7 +9166,8 @@ export interface Locale extends ILocale { */ "sectionNameNone": string; /** - * 現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。[ここ](https://go.misskey.io/donate)からプランをアップグレードできます。 + * 現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。 + * [ここ](https://go.misskey.io/donate)からプランをアップグレードできます。 */ "policyDisplayLimitExceeded": ParameterizedString<"max">; }; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5612736be..f53803b3a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1370,8 +1370,8 @@ _abuseReportCategory: otherBreach_description: "明確に分類されないその他の規約違反行為" violationRights: "権利侵害やなりすまし（侵害を受けた権利者本人によるご申告）" violationRights_description: "権利者本人の著作権、商標権、またはその他の権利を侵害する投稿及びなりすまし行為" - violationRightsOther: "権利侵害やなりすまし（第三者による通報）" - violationRightsOther_description: "他人の著作権、商標権、またはその他の権利を侵害する投稿及びなりすまし行為\n第三者による通報の場合、法律で定められた非親告罪の範囲外のケースには対応できないことがあります" + violationRightsOther: "権利侵害（第三者による通報）" + violationRightsOther_description: "他人の著作権、商標権、またはその他の権利を侵害する行為\n第三者による通報の場合、法律で定められた非親告罪の範囲外のケースには対応できないことがあります" notLike: "この人が気に入らない" notLike_description: "個人的な理由で不快と感じるユーザーや投稿" other: "その他" @@ -2377,7 +2377,7 @@ _postForm: d: "言いたいことは？" e: "ここに書いてください" f: "あなたが書くのを待っています..." - guidelineInfo: "[NSFWガイドライン]({nsfwGuideUrl})を必ずお読みになってからご利用ください。" + tosAndGuidelinesInfo: "投稿する前に、[利用規約]({tosUrl})と[NSFWガイドライン](https://go.misskey.io/media-guideline)を必ずお読みください。" _profile: name: "名前" @@ -2403,7 +2403,7 @@ _profile: sectionName: "セクション名" sectionNameNoneDescription: "セクション名を表示しないようにする" sectionNameNone: "名前が表示されないセクション" - policyDisplayLimitExceeded: "現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。[ここ](https://go.misskey.io/donate)からプランをアップグレードできます。" + policyDisplayLimitExceeded: "現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。\n[ここ](https://go.misskey.io/donate)からプランをアップグレードできます。" _exportOrImport: allNotes: "全てのノート" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index d90bd9adf..d51745adb 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1362,8 +1362,8 @@ _abuseReportCategory: otherBreach_description: "명확하게 분류되지 않는 기타 규약 위반 행위" violationRights: "권리 침해 또는 사칭 (권리자 본인에 의한 신고)" violationRights_description: "권리자 본인의 저작권, 상표권 또는 기타 권리를 침해하는 게시물 및 사칭 행위" - violationRightsOther: "권리 침해 또는 사칭 (제3자에 의한 신고)" - violationRightsOther_description: "타인의 저작권, 상표권 또는 기타 권리를 침해하는 게시물 및 사칭 행위\n제3자에 의한 신고의 경우, 법으로 정해진 비친고죄 범위 외의 사례에는 대응할 수 없습니다" + violationRightsOther: "권리 침해 (제3자에 의한 신고)" + violationRightsOther_description: "타인의 저작권, 상표권 또는 기타 권리를 침해하는 행위\n제3자에 의한 신고의 경우, 법으로 정해진 비친고죄 범위 외의 사례에는 대응할 수 없습니다" notLike: "이 사람이 마음에 들지 않음" notLike_description: "개인적인 이유로 불쾌감을 느끼는 사용자나 게시물" other: "기타" @@ -2310,6 +2310,7 @@ _postForm: d: "말하고 싶은 게 있나요?" e: "여기에 적어 주세요" f: "글 쓰기를 기다려요…" + tosAndGuidelinesInfo: "노트를 게시하기 전에 [이용약관]({tosUrl})과 [NSFW 가이드라인](https://go.misskey.io/media-guideline)을 반드시 읽어 주세요." _profile: name: "이름" username: "사용자 이름" @@ -2334,7 +2335,7 @@ _profile: sectionName: "섹션 이름" sectionNameNoneDescription: "섹션 이름이 표시되지 않도록 합니다" sectionNameNone: "이름이 표시되지 않는 섹션" - policyDisplayLimitExceeded: "현재 지원 플랜의 표시 제한({max}개)을 초과하였기 때문에 이 항목은 표시되지 않습니다. [여기](https://go.misskey.io/donate)에서 플랜을 업그레이드할 수 있습니다." + policyDisplayLimitExceeded: "현재 지원 플랜의 표시 제한({max}개)을 초과하였기 때문에 이 항목은 표시되지 않습니다.\n[여기](https://go.misskey.io/donate)에서 플랜을 업그레이드할 수 있습니다." _exportOrImport: allNotes: "모든 노트" favoritedNotes: "즐겨찾기한 노트" diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index ddf4a157d..878958da5 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -86,7 +86,9 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.tsx.willBePostedAt({ x: dateTimeFormat.format(scheduledTime) }) }} - + + + @@ -228,8 +230,6 @@ const imeText = ref(''); const showingOptions = ref(false); const textAreaReadOnly = ref(false); -const nsfwGuideUrl = 'https://go.misskey.io/media-guideline'; - const draftKey = computed((): string => { let key = channel.value ? `channel:${channel.value.id}` : ''; @@ -1443,10 +1443,6 @@ defineExpose({ color: var(--accent); } -.guidelineInfo { - margin-top: 8px; -} - @container (max-width: 500px) { .headerRight { font-size: .9em;