From 98c23bb2cc3b90cc4ae04a65c1690d22ffeb9054 Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 18 Sep 2021 21:38:33 +0800 Subject: [PATCH] ui: easy locale change --- packages/hydrooj/locales/en.yaml | 1 + packages/hydrooj/package.json | 2 +- packages/hydrooj/src/service/server.ts | 3 --- packages/ui-default/package.json | 2 +- packages/ui-default/templates/partials/nav.html | 10 ++++++++++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/hydrooj/locales/en.yaml b/packages/hydrooj/locales/en.yaml index ca277a2b5..cd9082381 100644 --- a/packages/hydrooj/locales/en.yaml +++ b/packages/hydrooj/locales/en.yaml @@ -3,6 +3,7 @@ __langname: English Can be Extended For: Extension contest_create: Contest Create contest_detail_problem_submit: Submit Contest Problem +contest_detail: Contest Detail contest_edit: Contest Edit contest_main: Contest contest_scoreboard: Scoreboard diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index eca732ba3..bec3b3800 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.36.5", + "version": "2.36.6", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index 07217b7ee..a75b3e2da 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -527,9 +527,6 @@ export class Handler extends HandlerCommon { this.session.scope = PERM.PERM_ALL.toString(); this.user = await user.getById(domainId, this.session.uid, this.session.scope); } - if (!this.session._id && this.request.headers['accept-language'] && !this.request.headers['accept-language'].startsWith('zh')) { - this.session.viewLang = 'en'; - } if (this.user._id === 0 && this.session.viewLang) this.user.viewLang = this.session.viewLang; this.user.avatarUrl = avatar(this.user.avatar, 128); this.csrfToken = this.getCsrfToken(this.session._id || String.random(32)); diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index b205e08f0..a34da3a64 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.21.8", + "version": "4.21.9", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/partials/nav.html b/packages/ui-default/templates/partials/nav.html index aa88b6f5c..8b3752e2b 100644 --- a/packages/ui-default/templates/partials/nav.html +++ b/packages/ui-default/templates/partials/nav.html @@ -18,6 +18,16 @@ {% if not handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
  • {{ _('Login') }}
  • {{ _('Sign Up') }}
    • +
  • + + Language + + +
    • {% else %}
  • {{ handler.user.uname }}