From 1ab09e64647d3d8b99e1d32b9ba1ed99950c3fbc Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Wed, 17 May 2023 17:33:27 +0900
Subject: [PATCH] about-misskey improvements

---
 locales/en-US.yml                             |  3 +-
 locales/ja-JP.yml                             |  3 +-
 locales/ko-KR.yml                             |  3 +-
 packages/frontend/src/pages/about-misskey.vue | 39 ++++++++++---------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 7f0a41dcbd..6ca9b202fc 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1489,7 +1489,7 @@ _registry:
   createKey: "Create key"
 _aboutMisskey:
   about: "CherryPick is a customization client based on Misskey that has been in development since 2021."
-  contributors: "Main contributors (Misskey)"
+  contributors: "Main contributors"
   allContributors: "All contributors"
   source: "Source code"
   translation: "Translate Misskey"
@@ -1501,7 +1501,6 @@ _aboutMisskey:
     donate: "Donate to Kokonect"
   _cherrypick:
     about: "This Misskey was customized by NoriDev!"
-    contributors: "Main contributors (CherryPick)"
     translation: "Translate CherryPick"
     donate: "Donate to CherryPick"
     relayServer: "Relay Server"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index da78a34782..aa7cee4087 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1510,7 +1510,7 @@ _registry:
 
 _aboutMisskey:
   about: "CherryPickは、Misskeyをベースに2021年から開発中のカスタマイズクライアントです。"
-  contributors: "主なコントリビューター(Misskey)"
+  contributors: "主なコントリビューター"
   allContributors: "全てのコントリビューター"
   source: "ソースコード"
   translation: "Misskeyを翻訳"
@@ -1522,7 +1522,6 @@ _aboutMisskey:
     donate: "ココネクトに寄付"
   _cherrypick:
     about: "このMisskeyはNoriDevによってカスタムされました！"
-    contributors: "主なコントリビューター(CherryPick)"
     translation: "CherryPickを翻訳"
     donate: "CherryPickに寄付"
     relayServer: "リレーサーバー"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 79087d21a5..c06bad7e1d 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1485,7 +1485,7 @@ _registry:
   createKey: "키 생성"
 _aboutMisskey:
   about: "CherryPick은 Misskey를 기반으로 2021년부터 개발되어 오고 있는 커스터마이즈 클라이언트에요."
-  contributors: "주요 기여자 (Misskey)"
+  contributors: "주요 기여자"
   allContributors: "모든 기여자"
   source: "소스 코드"
   translation: "Misskey를 번역하기"
@@ -1497,7 +1497,6 @@ _aboutMisskey:
     donate: "코코넥트에 기부하기"
   _cherrypick:
     about: "이 Misskey는 NoriDev에 의해 커스텀 되었어요!"
-    contributors: "주요 기여자 (CherryPick)"
     translation: "CherryPick 번역하기"
     donate: "CherryPick에 기부하기"
     relayServer: "릴레이 서버"
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index cb98c71024..bb955cf604 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -89,48 +89,47 @@
 						</FormLink>
 					</div>
 				</FormSection>
-				<FormSection>
-					<template #label>{{ i18n.ts._aboutMisskey._cherrypick.contributors }}</template>
-					<div :class="$style.contributors">
-						<a href="https://github.com/noridev" target="_blank" :class="$style.contributor">
-							<img src="https://avatars.githubusercontent.com/u/11006910?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@noridev</span>
-						</a>
-					</div>
-					<template #caption><MkLink url="https://github.com/kokonect-link/cherrypick/graphs/contributors">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
-				</FormSection>
 				<FormSection>
 					<template #label>{{ i18n.ts._aboutMisskey.contributors }}</template>
 					<div :class="$style.contributors">
 						<a href="https://github.com/syuilo" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/4439005?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@syuilo</span>
+							<span :class="$style.contributorUsername">@syuilo (Misskey)</span>
 						</a>
 						<a href="https://github.com/tamaina" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/7973572?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@tamaina</span>
+							<span :class="$style.contributorUsername">@tamaina (Misskey)</span>
 						</a>
 						<a href="https://github.com/acid-chicken" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/20679825?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@acid-chicken</span>
+							<span :class="$style.contributorUsername">@acid-chicken (Misskey)</span>
 						</a>
 						<a href="https://github.com/rinsuki" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/6533808?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@rinsuki</span>
+							<span :class="$style.contributorUsername">@rinsuki (Misskey)</span>
 						</a>
 						<a href="https://github.com/mei23" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/30769358?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@mei23</span>
+							<span :class="$style.contributorUsername">@mei23 (Misskey)</span>
 						</a>
 						<a href="https://github.com/robflop" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/8159402?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@robflop</span>
+							<span :class="$style.contributorUsername">@robflop (Misskey)</span>
+						</a>
+						<a href="https://github.com/noridev" target="_blank" :class="$style.contributor">
+							<img src="https://avatars.githubusercontent.com/u/11006910?v=4" :class="$style.contributorAvatar">
+							<span :class="$style.contributorUsername">@noridev (CherryPick)</span>
 						</a>
 					</div>
 					<template #caption><MkLink url="https://github.com/misskey-dev/misskey/graphs/contributors">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
 				</FormSection>
 				<FormSection>
 					<template #label><Mfm text="$[jelly ❤]"/> {{ i18n.ts._aboutMisskey.patrons }}</template>
+					<p style="font-weight: bold">CherryPick</p>
+					<div style="margin-top: 16px; display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); grid-gap: 12px;">
+						<div v-for="patron in patronsWithCherryPick" :key="patron">{{ patron }}</div>
+					</div>
+					<p style="font-weight: bold; padding-top: 20px"><b>Misskey</b></p>
 					<div :class="$style.patronsWithIcon">
 						<div v-for="patron in patronsWithIcon" :class="$style.patronWithIcon">
 							<img :src="patron.icon" :class="$style.patronIcon">
@@ -138,7 +137,7 @@
 						</div>
 					</div>
 					<div style="margin-top: 16px; display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); grid-gap: 12px;">
-						<div v-for="patron in patrons" :key="patron">{{ patron }}</div>
+						<div v-for="patron in patronsWithMisskey" :key="patron">{{ patron }}</div>
 					</div>
 					<p>{{ i18n.ts._aboutMisskey.morePatrons }}</p>
 				</FormSection>
@@ -204,7 +203,11 @@ const patronsWithIcon = [{
 	icon: 'https://misskey-hub.net/patrons/be1326bda7d940a482f3758ffd9ffaf6.jpg',
 }];
 
-const patrons = [
+const patronsWithCherryPick = [
+	'Inger 잉어',
+];
+
+const patronsWithMisskey = [
 	'まっちゃとーにゅ',
 	'mametsuko',
 	'noellabo',