usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-07-09 16:55:59 +09:00
parent a7aa924949 2f451fa058
commit 933c83679e
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
locales/en-US.yml
View File

@ -191,7 +191,10 @@ common:
web-search-engine: "Web search engine"
web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
paste: "Paste"
pasted-file-name: "Template for pasted file name"
pasted-file-name-desc: "Example: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
paste-dialog: "Edit the pasted file name"
paste-dialog-desc: "Display the dialog to edit the file name when you pasting file."
keep-cw: "Preserve content warning"
keep-cw-desc: "When replying to a post, the same content warning is set by default to the reply, as has been set by the original post."
i-like-sushi: "I prefer sushi rather than pudding"

11
src/init.ts
View File

@ -1,11 +0,0 @@
import { initDb } from './db/postgre';
console.log('Init database...');
initDb(false, true, true).then(() => {
console.log('Done :)');
process.exit(0);
}, e => {
console.error('Failed to init database');
console.error(e);
});