Merge branch 'master' into v12.102.1

This commit is contained in:
こけっち 2022-01-29 05:34:03 +09:00 committed by GitHub
commit 33871f3cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1792 additions and 5 deletions

View File

@ -24,6 +24,7 @@ const languages = [
'fr-FR', 'fr-FR',
'id-ID', 'id-ID',
'it-IT', 'it-IT',
'ja-NY',
'ja-JP', 'ja-JP',
'ja-KS', 'ja-KS',
'kab-KAB', 'kab-KAB',
@ -56,6 +57,7 @@ module.exports = Object.entries(locales)
const [lang] = k.split('-'); const [lang] = k.split('-');
switch (k) { switch (k) {
case 'ja-JP': return v; case 'ja-JP': return v;
case 'ja-NY':
case 'ja-KS': case 'ja-KS':
case 'en-US': return merge(locales['ja-JP'], v); case 'en-US': return merge(locales['ja-JP'], v);
default: return merge( default: return merge(

1785
locales/ja-NY.yml Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,10 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.102.1", "version": "12.102.1-simkey",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/misskey-dev/misskey.git" "url": "https://github.com/sim1222/misskey.git"
}, },
"private": true, "private": true,
"scripts": { "scripts": {

View File

@ -4,7 +4,7 @@
"start_url": "/", "start_url": "/",
"display": "standalone", "display": "standalone",
"background_color": "#313a42", "background_color": "#313a42",
"theme_color": "#86b300", "theme_color": "#a7dc4e",
"icons": [ "icons": [
{ {
"src": "/static-assets/icons/192.png", "src": "/static-assets/icons/192.png",

View File

@ -19,8 +19,8 @@ html
meta(charset='utf-8') meta(charset='utf-8')
meta(name='application-name' content='Misskey') meta(name='application-name' content='Misskey')
meta(name='referrer' content='origin') meta(name='referrer' content='origin')
meta(name='theme-color' content='#86b300') meta(name='theme-color' content='#a7dc4e')
meta(name='theme-color-orig' content='#86b300') meta(name='theme-color-orig' content='#a7dc4e')
meta(property='og:site_name' content= instanceName || 'Misskey') meta(property='og:site_name' content= instanceName || 'Misskey')
meta(name='viewport' content='width=device-width, initial-scale=1') meta(name='viewport' content='width=device-width, initial-scale=1')
link(rel='icon' href= icon || '/favicon.ico') link(rel='icon' href= icon || '/favicon.ico')