diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2019-02-04 02:06:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 02:06:46 +0900 |
| commit | 353fc18f195253d3f5dfab67b93a2470268bbd34 (patch) | |
| tree | cee1303904f2817d026d724c4b17e9ec9aac698c /src | |
| parent | Update load.ts (diff) | |
| parent | New translations ja-JP.yml (Polish) (#4119) (diff) | |
| download | misskey-353fc18f195253d3f5dfab67b93a2470268bbd34.tar.gz misskey-353fc18f195253d3f5dfab67b93a2470268bbd34.tar.bz2 misskey-353fc18f195253d3f5dfab67b93a2470268bbd34.zip | |
Merge branch 'develop' into acid-chicken-patch-10
Diffstat (limited to 'src')
| -rw-r--r-- | src/@types/const.json.d.ts | 3 | ||||
| -rw-r--r-- | src/server/web/docs.ts | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/@types/const.json.d.ts b/src/@types/const.json.d.ts new file mode 100644 index 0000000000..40a96f2a2a --- /dev/null +++ b/src/@types/const.json.d.ts @@ -0,0 +1,3 @@ +declare module '*/const.json' { + const copyright: string; +} diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts index f823c308c2..0597f50a9c 100644 --- a/src/server/web/docs.ts +++ b/src/server/web/docs.ts @@ -14,9 +14,9 @@ import * as glob from 'glob'; import * as yaml from 'js-yaml'; import config from '../../config'; import { licenseHtml } from '../../misc/license'; -const constants = require('../../const.json'); +import { copyright } from '../../const.json'; import endpoints from '../api/endpoints'; -const locales = require('../../../locales'); +import locales from '../../../locales'; import * as nestedProperty from 'nested-property'; function getLang(lang: string): string { @@ -59,7 +59,7 @@ async function genVars(lang: string): Promise<{ [key: string]: any }> { vars['config'] = config; - vars['copyright'] = constants.copyright; + vars['copyright'] = copyright; vars['license'] = licenseHtml; |