Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: translation enhance

Browse Source
This commit is contained in:
undefined committed 2022-06-29 00:15:22 +08:00
1 parent 2b0bd3df04
commit 0bb6be0eaf
4 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "3.14.1", "version": "3.14.2",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
packages/hydrooj/src/service/layers/domain.ts
+1
View File
@@ -5,6 +5,7 @@ import token from 'hydrooj/src/model/token';
export default async (ctx, next) => { export default async (ctx, next) => {
const forceDomain = /^\/d\/([^/]+)\//.exec(ctx.request.path); const forceDomain = /^\/d\/([^/]+)\//.exec(ctx.request.path);
ctx.originalPath = ctx.request.path;
ctx.path = ctx.request.path = ctx.request.path.replace(/^\/d\/[^/]+\//, '/'); ctx.path = ctx.request.path = ctx.request.path.replace(/^\/d\/[^/]+\//, '/');
const [xff, xhost] = system.getMany(['server.xff', 'server.xhost']); const [xff, xhost] = system.getMany(['server.xff', 'server.xhost']);
const ip = ctx.request.headers[xff?.toLowerCase() || ''] as string || ctx.request.ip; const ip = ctx.request.headers[xff?.toLowerCase() || ''] as string || ctx.request.ip;
packages/hydrooj/src/service/layers/renderer.ts
+1 -2
View File
@@ -1,6 +1,5 @@
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) {
@@ -66,7 +65,7 @@ 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(), system.get('server.language')); return str.toString().translate(lang, ...ctx.acceptsLanguages());
}; };
await next(); await next();
}; };
packages/hydrooj/src/service/server.ts
+2 -1
View File
@@ -232,7 +232,8 @@ export class Handler extends HandlerCommon {
if (!error.msg) error.msg = () => error.message; if (!error.msg) error.msg = () => error.message;
if (error instanceof UserFacingError && !process.env.DEV) error.stack = ''; if (error instanceof UserFacingError && !process.env.DEV) error.stack = '';
if (!(error instanceof NotFoundError)) { if (!(error instanceof NotFoundError)) {
logger.error(`User: ${this.user._id}(${this.user.uname}) ${this.request.method}: ${this.request.path}`, error.msg(), error.params); // eslint-disable-next-line max-len
logger.error(`User: ${this.user._id}(${this.user.uname}) ${this.request.method}: /d/${this.domain._id}${this.request.path}`, error.msg(), error.params);
if (error.stack) logger.error(error.stack); if (error.stack) logger.error(error.stack);
} }
if (this.user?._id === 0 && (error instanceof PermissionError || error instanceof PrivilegeError)) { if (this.user?._id === 0 && (error instanceof PermissionError || error instanceof PrivilegeError)) {