Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert "New locale yojo"" #361

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Revert "Revert "New locale yojo"" #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions locales/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const languages = [
'it-IT',
'ja-JP',
'ja-KS',
'ja-YO',
'kab-KAB',
'kn-IN',
'ko-KR',
Expand All @@ -44,7 +45,7 @@ const languages = [

const primaries = {
'en': 'US',
'ja': 'JP',
'ja': 'YO',
'ko': 'KR',
'zh': 'CN',
};
Expand Down Expand Up @@ -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]}`] ?? {},
Expand Down
8 changes: 4 additions & 4 deletions locales/ja-JP.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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日"
Expand Down
Loading
Loading