core: add server.lang to default fallback

This commit is contained in:
undefined committed 2022-06-30 21:45:21 +08:00
1 parent f51d94edca
commit f83af97ac0
2 files changed
+5 -2

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "3.14.3", "version": "3.14.4",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
@@ -1,5 +1,6 @@
import { ObjectID } from 'mongodb'; import { ObjectID } from 'mongodb';
import avatar from 'hydrooj/src/lib/avatar'; import avatar from 'hydrooj/src/lib/avatar';
import * as system from 'hydrooj/src/model/system';
import type { KoaContext } from '../server'; import type { KoaContext } from '../server';
function serializer(k: string, v: any) { function serializer(k: string, v: any) {
@@ -65,7 +66,9 @@ export default (router, logger) => async (ctx: KoaContext, next) => {
ctx.translate = (str: string) => { ctx.translate = (str: string) => {
if (!str) return ''; if (!str) return '';
const lang = ctx.HydroContext.user?.viewLang || ctx.session?.viewLang; const lang = ctx.HydroContext.user?.viewLang || ctx.session?.viewLang;
return str.toString().translate(lang, ...ctx.acceptsLanguages()); return lang
? str.toString().translate(lang, ...ctx.acceptsLanguages())
: str.toString().translate(...ctx.acceptsLanguages(), system.get('server.language'));
}; };
await next(); await next();
}; };