woem.men/forkey
4
2
Fork 3
Code Issues 34 Pull requests 16 Projects Releases Packages Wiki Activity Actions

Merge upstream 2025-01-17 #40

Merged
ashten merged 35 commits from sugar/forkey:merge-upstream-2025-01-17 into main 2025-02-03 16:05:49 +00:00
Conversation 3 Commits 35 Files changed 109 +21 -22
5 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f60d9da614 - Show all commits

7
locales/en-US.yml
View file

@ -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"

11
locales/index.d.ts vendored
View file

@ -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">;
};

8
locales/ja-JP.yml
View file

@ -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: "全てのノート"

7
locales/ko-KR.yml
View file

@ -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: "즐겨찾기한 노트"

10
packages/frontend/src/components/MkPostForm.vue
View file

@ -86,7 +86,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<span>{{ i18n.tsx.willBePostedAt({ x: dateTimeFormat.format(scheduledTime) }) }}</span>
<button class="_button" style="margin-left: auto" @click="scheduledTime = null"><i class="ti ti-x"></i></button>
</div>
<MkInfo v-if="files.length > 0" warn :class="$style.guidelineInfo" :rounded="false"><Mfm :text="i18n.tsx._postForm.guidelineInfo({ tosUrl: instance.tosUrl, nsfwGuideUrl })"/></MkInfo>
<MkInfo v-if="files.length > 0 && instance.tosUrl" warn style="margin-top: 8px;" :rounded="false">
<Mfm :text="i18n.tsx._postForm.tosAndGuidelinesInfo({ tosUrl: instance.tosUrl })"/>
</MkInfo>
<XPostFormAttaches v-model="files" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName" @replaceFile="replaceFile"/>
<MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
<MkNotePreview v-if="showPreview" :class="$style.preview" :text="text" :files="files" :poll="poll ?? undefined" :useCw="useCw" :cw="cw" :user="postAccount ?? $i"/>
@ -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;