From 27b40053c7a075c06a86e4d00e928e6d7d384d22 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 20 Sep 2022 07:14:47 +0900
Subject: [PATCH] :art:

---
 locales/ja-JP.yml                   |  1 +
 packages/client/src/pages/about.vue | 10 ++++++----
 packages/client/src/style.scss      |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b10cce9231..cedfe7b1b2 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2,6 +2,7 @@ _lang_: "日本語"
 
 headlineMisskey: "ノートでつながるネットワーク"
 introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスです。\n「ノート」を作成して、いま起こっていることを共有したり、あなたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加することもできます👍\n新しい世界を探検しよう🚀"
+poweredByMisskeyDescription: "{name}は、オープンソースのプラットフォーム<b>Misskey</b>を使ったサービス(Misskeyインスタンスと呼ばれます)のひとつです。"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 33c55fecef..d124db55a7 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -5,16 +5,16 @@
 		<div class="_formRoot">
 			<div class="_formBlock fwhjspax" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
 				<div class="content">
-					<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
+					<img :src="$instance.iconUrl ?? $instance.faviconUrl ?? '/favicon.ico'" alt="" class="icon"/>
 					<div class="name">
-						<b>{{ $instance.name || host }}</b>
+						<b>{{ $instance.name ?? host }}</b>
 					</div>
 				</div>
 			</div>
 
 			<MkKeyValue class="_formBlock">
 				<template #key>{{ i18n.ts.description }}</template>
-				<template #value>{{ $instance.description }}</template>
+				<template #value><div v-html="$instance.description"></div></template>
 			</MkKeyValue>
 
 			<FormSection>
@@ -22,6 +22,8 @@
 					<template #key>Misskey</template>
 					<template #value>{{ version }}</template>
 				</MkKeyValue>
+				<div class="_formBlock" v-html="i18n.t('poweredByMisskeyDescription', { name: $instance.name ?? host })">
+				</div>
 				<FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink>
 			</FormSection>
 
@@ -83,7 +85,7 @@
 import { ref, computed } from 'vue';
 import XEmojis from './about.emojis.vue';
 import XFederation from './about.federation.vue';
-import { version, instanceName , host } from '@/config';
+import { version, instanceName, host } from '@/config';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import FormSuspense from '@/components/form/suspense.vue';
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 27e33702ad..69be6d33be 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -74,7 +74,7 @@ html {
 	}
 
 	&.useSystemFont {
-		font-family: sans-serif;
+		font-family: 'Hiragino Maru Gothic Pro', sans-serif;
 	}
 }