diff --git a/server/localeFont.js b/server/localeFont.ts similarity index 68% rename from server/localeFont.js rename to server/localeFont.ts index 4c497a840..f37fe3e74 100644 --- a/server/localeFont.js +++ b/server/localeFont.ts @@ -3,24 +3,26 @@ import fs from 'fs'; const __dirname = new URL('.', import.meta.url).pathname; -const vars = {}; +const vars: Record = {}; for (const [, name, value] of fs.readFileSync(`${__dirname}/../data/variables.scss`).toString('utf-8') .matchAll(/^\$([^:]+): '([^']+)'(?:, '[^']+')*;$/gm)) { vars[name] = value; } -const fontSources = { - Quicksand: 'quicksand-v21-latin-ext_latin-{weight}.ttf', +const fontSources: Record = { + 'Baloo Bhaijaan 2': 'baloo-bhaijaan-2-v19-arabic_latin-{weight}.ttf', + 'Nanum Gothic': 'nanum-gothic-v17-latin_korean-{weight}.ttf', Nunito: 'nunito-v16-latin-ext_latin_cyrillic-ext_cyrillic-{weight}.ttf', + Quicksand: 'quicksand-v21-latin-ext_latin-{weight}.ttf', 'Zen Maru Gothic': 'zen-maru-gothic-v4-latin_japanese-{weight}.ttf', }; -const weightsValues = { +const weightsValues: Record = { bold: '700', }; -export const registerLocaleFont = (v, weights = ['regular']) => { +export const registerLocaleFont = (v: string, weights: string[] = ['regular']): string => { const family = vars[v]; const source = fontSources[family]; for (const weight of weights) { diff --git a/server/routes/banner.js b/server/routes/banner.js index 672a634da..92305d48e 100644 --- a/server/routes/banner.js +++ b/server/routes/banner.js @@ -8,7 +8,7 @@ import { loadTsv } from '../../src/tsv.js'; import { handleErrorAsync } from '../../src/helpers.ts'; import { Translator } from '../../src/translator.js'; import { CacheObject } from '../../src/cache.js'; -import { registerLocaleFont } from '../localeFont.js'; +import { registerLocaleFont } from '../localeFont.ts'; const translations = loadSuml('translations'); const baseTranslations = loadSumlFromBase('locale/_base/translations'); diff --git a/server/routes/nouns.js b/server/routes/nouns.js index 277fa459a..017224a0d 100644 --- a/server/routes/nouns.js +++ b/server/routes/nouns.js @@ -5,7 +5,7 @@ import { createCanvas, loadImage, registerFont } from 'canvas'; import { loadSuml } from '../loader.ts'; import { clearKey, handleErrorAsync, isTroll } from '../../src/helpers.ts'; import { caches } from '../../src/cache.js'; -import { registerLocaleFont } from '../localeFont.js'; +import { registerLocaleFont } from '../localeFont.ts'; import auditLog from '../audit.ts'; const translations = loadSuml('translations');