From 9ec3f97505cfcd27685069bcbb27a1d7552af012 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 9 Aug 2022 02:09:09 -0700
Subject: [PATCH] Seperate splash screen settings in admin panel

---
 locales/en-US.yml                            |  1 +
 locales/ja-JP.yml                            |  1 +
 package.json                                 |  2 +-
 packages/client/src/pages/admin/settings.vue | 24 ++++++++++++--------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d7e8c224b7..f64a7c20d1 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -912,6 +912,7 @@ showUpdates: "Show a popup when Calckey updates"
 recommendedInstances: "Recommended instances"
 recommendedInstancesDescription: "Recommended instances seperated by line breaks to appear in the recommended timeline. Do NOT add `https://`, ONLY the domain."
 caption: "Auto Caption"
+splash: "Splash Screen"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index ac7154de2a..ecd30b42d8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -912,6 +912,7 @@ showUpdates: "Calckeyの更新時にポップアップを表示する"
 recommendedInstances: "推奨インスタンス"
 recommendedInstancesDescription: "推奨タイムラインに表示するために改行で区切られた推奨インスタンス。`https：//`を追加しないでください。ドメインのみを追加してください。"
 caption: "自動キャプション"
+splash: "スプラッシュスクリーン"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
diff --git a/package.json b/package.json
index fa1ae45456..6fe1d479de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.rc.6",
+	"version": "12.118.1-calc.rc.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index 101c4a6b4d..43d1f43f94 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -34,16 +34,6 @@
 						<template #caption>{{ i18n.ts.pinnedUsersDescription }}</template>
 					</FormTextarea>
 
-					<FormTextarea v-model="customMOTD" class="_formBlock">
-						<template #label>{{ i18n.ts.customMOTD }}</template>
-						<template #caption>{{ i18n.ts.customMOTDDescription }}</template>
-					</FormTextarea>
-
-					<FormTextarea v-model="customSplashIcons" class="_formBlock">
-						<template #label>{{ i18n.ts.customSplashIcons }}</template>
-						<template #caption>{{ i18n.ts.customSplashIconsDescription }}</template>
-					</FormTextarea>
-
 					<FormSection>
 						<FormSwitch v-model="enableRegistration" class="_formBlock">
 							<template #label>{{ i18n.ts.enableRegistration }}</template>
@@ -66,6 +56,20 @@
 						<FormInfo class="_formBlock">{{ i18n.ts.disablingTimelinesInfo }}</FormInfo>
 					</FormSection>
 
+					<FormSection>
+						<template #label>{{ i18n.ts.splash }}</template>
+
+						<FormTextarea v-model="customMOTD" class="_formBlock">
+							<template #label>{{ i18n.ts.customMOTD }}</template>
+							<template #caption>{{ i18n.ts.customMOTDDescription }}</template>
+						</FormTextarea>
+
+						<FormTextarea v-model="customSplashIcons" class="_formBlock">
+							<template #label>{{ i18n.ts.customSplashIcons }}</template>
+							<template #caption>{{ i18n.ts.customSplashIconsDescription }}</template>
+						</FormTextarea>
+					</FormSection>
+
 					<FormSection>
 						<template #label>{{ i18n.ts.theme }}</template>