Merge branch 'new-locale-yojo' of https://github.com/yojo-art/cherrypick

into develop
yojo-art · Apr 8, 2024 · 98f6822 · 98f6822
2 parents fe7e66d + 97046fd
commit 98f6822
Show file tree

Hide file tree

Showing 3 changed files with 2,947 additions and 8 deletions.
diff --git a/locales/index.js b/locales/index.js
@@ -25,6 +25,7 @@ const languages = [
 	'it-IT',
 	'ja-JP',
 	'ja-KS',
+	'ja-YO',
 	'kab-KAB',
 	'kn-IN',
 	'ko-KR',
@@ -44,7 +45,7 @@ const languages = [
 
 const primaries = {
 	'en': 'US',
-	'ja': 'JP',
+	'ja': 'YO',
 	'ko': 'KR',
 	'zh': 'CN',
 };
@@ -72,11 +73,11 @@ export function build() {
 		.reduce((a, [k, v]) => (a[k] = (() => {
 			const [lang] = k.split('-');
 			switch (k) {
-				case 'ja-JP': return v;
+				case 'ja-YO': return v;
 				case 'ja-KS':
-				case 'en-US': return merge(locales['ja-JP'], v);
+				case 'en-US': return merge(locales['ja-YO'], v);
 				default: return merge(
-					locales['ja-JP'],
+					locales['ja-YO'],
 					locales['ko-KR'],
 					locales['en-US'],
 					locales[`${lang}-${primaries[lang]}`] ?? {},

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1647,15 +1647,15 @@ _achievements:
       title: "ビギナーⅢ"
       description: "通算ログイン日数が15日"
     _login30:
-      title: "ミスキストⅠ"
+      title: "チェリーピッカーⅠ"
       description: "通算ログイン日数が30日"
     _login60:
-      title: "ミスキストⅡ"
+      title: "チェリーピッカーⅡ"
       description: "通算ログイン日数が60日"
     _login100:
-      title: "ミスキストⅢ"
+      title: "チェリーピッカーⅢ"
       description: "通算ログイン日数が100日"
-      flavor: "そのユーザー、ミスキストにつき"
+      flavor: "そのユーザー、チェリーピッカーにつき"
     _login200:
       title: "常連Ⅰ"
       description: "通算ログイン日数が200日"