diff --git a/hydro/handler/home.js b/hydro/handler/home.js index 18061c0dd..995dfbd6e 100644 --- a/hydro/handler/home.js +++ b/hydro/handler/home.js @@ -125,7 +125,12 @@ class HomeSecurityHandler extends Handler { session.isCurrent = session._id === this.session._id; session._id = md5(session._id); if (useragent) session.updateUa = useragent.parse(session.updateUa || session.createUa || ''); - if (geoip) session.updateGeoip = geoip.lookup(session.updateIp || session.createIp); + if (geoip) { + session.updateGeoip = geoip.lookup( + session.updateIp || session.createIp, + this.translate('geoip_locale'), + ); + } } this.response.template = 'home_security.html'; this.response.body = { sessions, geoipProvider: (geoip || {}).provider }; diff --git a/hydro/service/server.js b/hydro/service/server.js index 7817fb844..4012d3a66 100644 --- a/hydro/service/server.js +++ b/hydro/service/server.js @@ -367,6 +367,7 @@ class Handler { } async onerror(error) { + if (!error.msg) error.msg = () => error.message; console.error(error.msg(), error.params); console.error(error.stack); this.response.status = error instanceof UserFacingError ? error.code : 500; diff --git a/templates/home_security.html b/templates/home_security.html index 580b91a49..61c379cf6 100644 --- a/templates/home_security.html +++ b/templates/home_security.html @@ -94,7 +94,7 @@
{{ _('Last Update At') }}: {{ datetimeSpan(session.updateAt)|safe }}
-{{ _('Location') }}: {{ _(session.updateGeoip) }} ({{ session.updateIp }})
+{{ _('Location') }}: {{ _(session.updateGeoip.display) }} ({{ session.updateIp }})
{{ _('Operating System') }}: {{ session.updateUa.os }}
{{ _('Browser') }}: {{ session.updateUa.name }} {{ session.updateUa.version }}