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: handle viewLang

Browse Source
This commit is contained in:
undefined committed 2021-09-24 12:03:24 +08:00
1 parent 6231eccb53
commit a2f1e886db
2 files changed
+4 -3
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": "2.39.1", "version": "2.39.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/server.ts
+3 -2
View File
@@ -312,7 +312,7 @@ export class HandlerCommon {
translate(str: string) { translate(str: string) {
if (!str) return ''; if (!str) return '';
return str.toString().translate(this.user?.viewLang || system.get('server.language'), this.session?.viewLang); return str.toString().translate(this.user?.viewLang || this.session?.viewLang || system.get('server.language'));
} }
renderTitle(str: string) { renderTitle(str: string) {
@@ -527,7 +527,8 @@ export class Handler extends HandlerCommon {
this.session.scope = PERM.PERM_ALL.toString(); this.session.scope = PERM.PERM_ALL.toString();
this.user = await user.getById(domainId, this.session.uid, this.session.scope); this.user = await user.getById(domainId, this.session.uid, this.session.scope);
} }
if (this.user._id === 0 && this.session.viewLang) this.user.viewLang = this.session.viewLang; if (this.user._id !== 0 && this.session.viewLang) this.user.viewLang = this.session.viewLang;
else if (this.user._id === 0) delete this.user.viewLang;
this.user.avatarUrl = avatar(this.user.avatar, 128); this.user.avatarUrl = avatar(this.user.avatar, 128);
this.csrfToken = this.getCsrfToken(this.session._id || String.random(32)); this.csrfToken = this.getCsrfToken(this.session._id || String.random(32));
this.UiContext.csrfToken = this.csrfToken; this.UiContext.csrfToken = this.csrfToken;