Merge branch 'develop'

This commit is contained in:
sim1222 2022-06-17 00:03:25 +09:00
commit d9c04a1df3
2 changed files with 3 additions and 3 deletions

View File

@ -56,10 +56,10 @@ module.exports = Object.entries(locales)
.reduce((a, [k ,v]) => (a[k] = (() => {
const [lang] = k.split('-');
switch (k) {
case 'ja-NY': return v;
case 'ja-NY': return merge(locales['ja-JP'], v);
case 'ja-JP':
case 'ja-KS':
case 'en-US': return merge(locales['ja-NY'], v);
case 'en-US': return merge(locales['ja-JP'], v);
default: return merge(
locales['ja-NY'],
locales['ja-JP'],

View File

@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "12.111.1-simkey-v13",
"version": "12.111.1-simkey-v14",
"codename": "indigo",
"repository": {
"type": "git",