Merge branch 'develop' into acid-chicken-patch-10
This commit is contained in:
commit
353fc18f19
6 changed files with 24 additions and 15 deletions
3
src/@types/const.json.d.ts
vendored
Normal file
3
src/@types/const.json.d.ts
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
declare module '*/const.json' {
|
||||
const copyright: string;
|
||||
}
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue