Merge branch 'master' into l10n_master

This commit is contained in:
syuilo 2018-05-17 15:29:18 +09:00 committed by GitHub
commit 12cd3714e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 260 additions and 222 deletions

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ npm-debug.log
run.bat run.bat
api-docs.json api-docs.json
package-lock.json package-lock.json
yarn.lock

View file

@ -25,7 +25,7 @@ ultimately sophisticated new type of mini-blog based SNS.
* Real time contents * Real time contents
* ActivityPub compatible * ActivityPub compatible
and more! You can touch with your own eyes at https://misskey.xyz/. and more! You can touch with your own eyes at [misskey.xyz](https://misskey.xyz).
:package: Create your instance :package: Create your instance
---------------------------------------------------------------- ----------------------------------------------------------------
@ -36,7 +36,9 @@ please see [Setup and installation guide](./docs/setup.en.md).
---------------------------------------------------------------- ----------------------------------------------------------------
**[PR](https://github.com/syuilo/misskey/pulls)s welcome!** **[PR](https://github.com/syuilo/misskey/pulls)s welcome!**
If you want to translate Misskey, please see [Translation guide](./docs/translate.en.md). If you want to...
* i18n ... please see [Translation guide](./docs/translate.en.md).
* l10n ... please visit https://crowdin.com/project/misskey
:heart: Backers & Sponsors :heart: Backers & Sponsors
---------------------------------------------------------------- ----------------------------------------------------------------

3
crowdin.yml Normal file
View file

@ -0,0 +1,3 @@
files:
- source: /locales/ja.yml
translation: /locales/%two_letters_code%.yml

View file

@ -19,7 +19,7 @@ common:
wednesday: "W" wednesday: "W"
thursday: "T" thursday: "T"
friday: "F" friday: "F"
saturday: "" saturday: "S"
reactions: reactions:
like: "Like" like: "Like"
love: "Love" love: "Love"

View file

@ -19,7 +19,7 @@ common:
wednesday: "M" wednesday: "M"
thursday: "J" thursday: "J"
friday: "V" friday: "V"
saturday: "" saturday: "S"
reactions: reactions:
like: "Aime" like: "Aime"
love: "Adore" love: "Adore"

View file

@ -20,7 +20,7 @@ common:
wednesday: "水" wednesday: "水"
thursday: "木" thursday: "木"
friday: "金" friday: "金"
satruday: "土" saturday: "土"
reactions: reactions:
like: "いいね" like: "いいね"
@ -366,6 +366,12 @@ desktop/views/components/settings.profile.vue:
birthday: "誕生日" birthday: "誕生日"
save: "保存" save: "保存"
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.account.vue: desktop/views/components/ui.header.account.vue:
profile: "プロフィール" profile: "プロフィール"
drive: "ドライブ" drive: "ドライブ"

View file

@ -19,7 +19,7 @@ common:
wednesday: "Ś" wednesday: "Ś"
thursday: "C" thursday: "C"
friday: "P" friday: "P"
saturday: "" saturday: "S"
reactions: reactions:
like: "Lubię" like: "Lubię"
love: "Kocham" love: "Kocham"

View file

@ -7,7 +7,7 @@ import locale from '../../locales';
export default class Replacer { export default class Replacer {
private lang: string; private lang: string;
public pattern = /%i18n:([a-z0-9_\-@\.\!]+?)%/g; public pattern = /%i18n:([a-z0-9_\-\.\/\|\!]+?)%/g;
constructor(lang: string) { constructor(lang: string) {
this.lang = lang; this.lang = lang;
@ -53,23 +53,20 @@ export default class Replacer {
} }
} }
public replacement(ctx, match, key) { public replacement(match, key) {
const client = '/src/client/app/'; let path = null;
let name = null;
const shouldEscape = key[0] == '!'; const shouldEscape = key[0] == '!';
if (shouldEscape) { if (shouldEscape) {
key = key.substr(1); key = key.substr(1);
} }
if (key[0] == '@') { if (key.indexOf('|') != -1) {
name = ctx.src.substr(ctx.src.indexOf(client) + client.length); path = key.split('|')[0];
key = key.substr(1); key = key.split('|')[1];
} }
if (ctx && ctx.lang) this.lang = ctx.lang; const txt = this.get(path, key);
const txt = this.get(name, key);
return shouldEscape return shouldEscape
? txt.replace(/'/g, '\\x27').replace(/"/g, '\\x22') ? txt.replace(/'/g, '\\x27').replace(/"/g, '\\x22')

View file

@ -64,7 +64,7 @@ export default Vue.extend({
'%i18n:!common.weekday-short.wednesday%', '%i18n:!common.weekday-short.wednesday%',
'%i18n:!common.weekday-short.thursday%', '%i18n:!common.weekday-short.thursday%',
'%i18n:!common.weekday-short.friday%', '%i18n:!common.weekday-short.friday%',
'%i18n:!common.weekday-short.satruday%' '%i18n:!common.weekday-short.saturday%'
] ]
}; };
}, },

View file

@ -1,11 +1,11 @@
<template> <template>
<div class="mk-timeline"> <div class="mk-timeline">
<header> <header>
<span :data-active="src == 'home'" @click="src = 'home'">%fa:home% ホーム</span> <span :data-active="src == 'home'" @click="src = 'home'">%fa:home% %i18n:@home%</span>
<span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% ローカル</span> <span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% %i18n:@local%</span>
<span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% グローバル</span> <span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% %i18n:@global%</span>
<span :data-active="src == 'list'" @click="src = 'list'" v-if="list">%fa:list% {{ list.title }}</span> <span :data-active="src == 'list'" @click="src = 'list'" v-if="list">%fa:list% {{ list.title }}</span>
<button @click="chooseList" title="リスト">%fa:list%</button> <button @click="chooseList" title="%i18n:@list%">%fa:list%</button>
</header> </header>
<x-core v-if="src == 'home'" ref="tl" key="home" src="home"/> <x-core v-if="src == 'home'" ref="tl" key="home" src="home"/>
<x-core v-if="src == 'local'" ref="tl" key="local" src="local"/> <x-core v-if="src == 'local'" ref="tl" key="local" src="local"/>

View file

@ -87,6 +87,7 @@ export interface ILocalUser extends IUserBase {
export interface IRemoteUser extends IUserBase { export interface IRemoteUser extends IUserBase {
inbox: string; inbox: string;
endpoints: string[];
uri: string; uri: string;
url?: string; url?: string;
publicKey: { publicKey: {
@ -114,7 +115,7 @@ export function validatePassword(password: string): boolean {
} }
export function isValidName(name?: string): boolean { export function isValidName(name?: string): boolean {
return name === null || (typeof name == 'string' && name.length < 30 && name.trim() != ''); return name === null || (typeof name == 'string' && name.length < 50 && name.trim() != '');
} }
export function isValidDescription(description: string): boolean { export function isValidDescription(description: string): boolean {

View file

@ -14,7 +14,7 @@ export default async (job: kue.Job, done): Promise<void> => {
done(); done();
} else { } else {
console.warn(`deliver failed: ${res.statusMessage}`); console.warn(`deliver failed: ${res.statusMessage}`);
done(res); done(res.statusMessage);
} }
} }
}; };

View file

@ -49,6 +49,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
object == null || object == null ||
object.type !== 'Person' || object.type !== 'Person' ||
typeof object.preferredUsername !== 'string' || typeof object.preferredUsername !== 'string' ||
typeof object.inbox !== 'string' ||
!validateUsername(object.preferredUsername) || !validateUsername(object.preferredUsername) ||
!isValidName(object.name == '' ? null : object.name) !isValidName(object.name == '' ? null : object.name)
) { ) {
@ -100,6 +101,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
publicKeyPem: person.publicKey.publicKeyPem publicKeyPem: person.publicKey.publicKeyPem
}, },
inbox: person.inbox, inbox: person.inbox,
endpoints: person.endpoints,
uri: person.id, uri: person.id,
url: person.url url: person.url
}) as IRemoteUser; }) as IRemoteUser;
@ -207,7 +209,8 @@ export async function updatePerson(value: string | IObject, resolver?: Resolver)
followingCount, followingCount,
notesCount, notesCount,
name: person.name, name: person.name,
url: person.url url: person.url,
endpoints: person.endpoints
} }
}); });
} }

View file

@ -50,6 +50,7 @@ export interface IPerson extends IObject {
followers: any; followers: any;
following: any; following: any;
outbox: any; outbox: any;
endpoints: string[];
} }
export const isCollection = (object: IObject): object is ICollection => export const isCollection = (object: IObject): object is ICollection =>

View file

@ -1,5 +1,6 @@
import { lib as emojilib } from 'emojilib'; import { lib as emojilib } from 'emojilib';
import { JSDOM } from 'jsdom'; import { JSDOM } from 'jsdom';
import config from '../config';
const handlers = { const handlers = {
bold({ document }, { bold }) { bold({ document }, { bold }) {
@ -43,7 +44,7 @@ const handlers = {
mention({ document }, { content }) { mention({ document }, { content }) {
const a = document.createElement('a'); const a = document.createElement('a');
a.href = '/' + content; a.href = `${config.url}/${content}`;
a.textContent = content; a.textContent = content;
document.body.appendChild(a); document.body.appendChild(a);
}, },

View file

@ -13,6 +13,7 @@ const WebpackOnBuildPlugin = require('on-build-webpack');
const ProgressBarPlugin = require('progress-bar-webpack-plugin'); const ProgressBarPlugin = require('progress-bar-webpack-plugin');
import I18nReplacer from './src/build/i18n'; import I18nReplacer from './src/build/i18n';
import { pattern as i18nPattern, replacement as i18nReplacement } from './webpack/i18n';
import { pattern as faPattern, replacement as faReplacement } from './src/build/fa'; import { pattern as faPattern, replacement as faReplacement } from './src/build/fa';
const constants = require('./src/const.json'); const constants = require('./src/const.json');
import config from './src/config'; import config from './src/config';
@ -37,46 +38,33 @@ global['collapseSpacesReplacement'] = html => {
global['base64replacement'] = (_, key) => { global['base64replacement'] = (_, key) => {
return fs.readFileSync(__dirname + '/src/client/' + key, 'base64'); return fs.readFileSync(__dirname + '/src/client/' + key, 'base64');
}; };
global['i18nReplacement'] = i18nReplacement;
//#endregion //#endregion
const langs = Object.keys(locales); const langs = Object.keys(locales);
// 無圧縮スクリプトを用意するのは重いので一時的に無効化 const isProduction = process.env.NODE_ENV == 'production';
//const entries = process.env.NODE_ENV == 'production'
// ? langs.map(l => [l, false]).concat(langs.map(l => [l, true]))
// : langs.map(l => [l, false]);
const entries = process.env.NODE_ENV == 'production'
? langs.map(l => [l, true])
: langs.map(l => [l, false]);
module.exports = entries.map(x => { // Entries
const [lang, isProduction] = x; const entry = {
// Chunk name
const name = lang;
// Entries
const entry = {
desktop: './src/client/app/desktop/script.ts', desktop: './src/client/app/desktop/script.ts',
mobile: './src/client/app/mobile/script.ts', mobile: './src/client/app/mobile/script.ts',
//ch: './src/client/app/ch/script.ts',
//stats: './src/client/app/stats/script.ts', //stats: './src/client/app/stats/script.ts',
//status: './src/client/app/status/script.ts', //status: './src/client/app/status/script.ts',
dev: './src/client/app/dev/script.ts', dev: './src/client/app/dev/script.ts',
auth: './src/client/app/auth/script.ts', auth: './src/client/app/auth/script.ts',
sw: './src/client/app/sw.js' sw: './src/client/app/sw.js'
}; };
const output = { const output = {
path: __dirname + '/built/client/assets', path: __dirname + '/built/client/assets',
filename: `[name].${version}.${lang}.${isProduction ? 'min' : 'raw'}.js` filename: `[name].${version}.-.${isProduction ? 'min' : 'raw'}.js`
}; };
const i18nReplacer = new I18nReplacer(lang as string); //#region Define consts
global['i18nReplacement'] = i18nReplacer.replacement; const consts = {
//#region Define consts
const consts = {
_RECAPTCHA_SITEKEY_: config.recaptcha.site_key, _RECAPTCHA_SITEKEY_: config.recaptcha.site_key,
_SW_PUBLICKEY_: config.sw ? config.sw.public_key : null, _SW_PUBLICKEY_: config.sw ? config.sw.public_key : null,
_THEME_COLOR_: constants.themeColor, _THEME_COLOR_: constants.themeColor,
@ -89,22 +77,22 @@ module.exports = entries.map(x => {
_API_URL_: config.api_url, _API_URL_: config.api_url,
_WS_URL_: config.ws_url, _WS_URL_: config.ws_url,
_DEV_URL_: config.dev_url, _DEV_URL_: config.dev_url,
_LANG_: lang, _LANG_: '%lang%',
_HOST_: config.host, _HOST_: config.host,
_HOSTNAME_: config.hostname, _HOSTNAME_: config.hostname,
_URL_: config.url, _URL_: config.url,
_LICENSE_: licenseHtml, _LICENSE_: licenseHtml,
_GOOGLE_MAPS_API_KEY_: config.google_maps_api_key _GOOGLE_MAPS_API_KEY_: config.google_maps_api_key
}; };
const _consts = {}; const _consts = {};
Object.keys(consts).forEach(key => { Object.keys(consts).forEach(key => {
_consts[key] = JSON.stringify(consts[key]); _consts[key] = JSON.stringify(consts[key]);
}); });
//#endregion //#endregion
const plugins = [ const plugins = [
//new HardSourceWebpackPlugin(), //new HardSourceWebpackPlugin(),
new ProgressBarPlugin({ new ProgressBarPlugin({
format: chalk` {cyan.bold yes we can} {bold [}:bar{bold ]} {green.bold :percent} {gray (:current/:total)} :elapseds`, format: chalk` {cyan.bold yes we can} {bold [}:bar{bold ]} {green.bold :percent} {gray (:current/:total)} :elapseds`,
@ -118,16 +106,30 @@ module.exports = entries.map(x => {
fs.writeFileSync('./built/client/meta.json', JSON.stringify({ fs.writeFileSync('./built/client/meta.json', JSON.stringify({
version version
}), 'utf-8'); }), 'utf-8');
//#region i18n
langs.forEach(lang => {
Object.keys(entry).forEach(file => {
let src = fs.readFileSync(`${__dirname}/built/client/assets/${file}.${version}.-.${isProduction ? 'min' : 'raw'}.js`, 'utf8');
const i18nReplacer = new I18nReplacer(lang);
src = src.replace(i18nReplacer.pattern, i18nReplacer.replacement);
src = src.replace('%lang%', lang);
fs.writeFileSync(`${__dirname}/built/client/assets/${file}.${version}.${lang}.${isProduction ? 'min' : 'raw'}.js`, src, 'utf8');
});
});
//#endregion
}), }),
new VueLoaderPlugin() new VueLoaderPlugin()
]; ];
if (isProduction) { if (isProduction) {
plugins.push(new webpack.optimize.ModuleConcatenationPlugin()); plugins.push(new webpack.optimize.ModuleConcatenationPlugin());
} }
return { module.exports = {
name,
entry, entry,
module: { module: {
rules: [{ rules: [{
@ -150,10 +152,9 @@ module.exports = entries.map(x => {
}, { }, {
loader: 'replace', loader: 'replace',
query: { query: {
search: i18nReplacer.pattern.toString(), search: i18nPattern.toString(),
replace: 'i18nReplacement', replace: 'i18nReplacement',
i18n: true, i18n: true
lang
} }
}, { }, {
loader: 'replace', loader: 'replace',
@ -238,10 +239,9 @@ module.exports = entries.map(x => {
}, { }, {
loader: 'replace', loader: 'replace',
query: { query: {
search: i18nReplacer.pattern.toString(), search: i18nPattern.toString(),
replace: 'i18nReplacement', replace: 'i18nReplacement',
i18n: true, i18n: true
lang
} }
}, { }, {
loader: 'replace', loader: 'replace',
@ -268,5 +268,4 @@ module.exports = entries.map(x => {
cache: true, cache: true,
devtool: false, //'source-map', devtool: false, //'source-map',
mode: isProduction ? 'production' : 'development' mode: isProduction ? 'production' : 'development'
}; };
});

24
webpack/i18n.ts Normal file
View file

@ -0,0 +1,24 @@
/**
* Replace i18n texts
*/
export const pattern = /%i18n:([a-z0-9_\-@\.\!]+?)%/g;
export const replacement = (ctx, match, key) => {
const client = '/src/client/app/';
let name = null;
const shouldEscape = key[0] == '!';
if (shouldEscape) {
key = key.substr(1);
}
if (key[0] == '@') {
name = ctx.src.substr(ctx.src.indexOf(client) + client.length);
key = key.substr(1);
}
const path = name ? `${name}|${key}` : key;
return shouldEscape ? `%i18n:!${path}%` : `%i18n:${path}%`;
};