lock screen message improvements

This commit is contained in:
Kyle Spearrin 2019-01-08 00:21:28 -05:00
parent e7c3d1048d
commit bccb77356b
4 changed files with 16 additions and 4 deletions

2
jslib

@ -1 +1 @@
Subproject commit e7464785e134e5d723a4901cf54c5dd1668efb5c Subproject commit 65bd33d860f3af71968a15e78491221091c4369e

View File

@ -19,6 +19,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="box-footer">
{{'loggedInAs' | i18n : email}}
</div>
</div> </div>
<div class="buttons"> <div class="buttons">
<button type="submit" class="btn primary block" appBlurClick> <button type="submit" class="btn primary block" appBlurClick>

View File

@ -2,7 +2,6 @@ import {
Component, Component,
NgZone, NgZone,
OnDestroy, OnDestroy,
OnInit,
} from '@angular/core'; } from '@angular/core';
import { import {
ActivatedRoute, ActivatedRoute,
@ -24,7 +23,7 @@ import { LockComponent as BaseLockComponent } from 'jslib/angular/components/loc
selector: 'app-lock', selector: 'app-lock',
templateUrl: 'lock.component.html', templateUrl: 'lock.component.html',
}) })
export class LockComponent extends BaseLockComponent implements OnInit, OnDestroy { export class LockComponent extends BaseLockComponent implements OnDestroy {
private reloadInterval: number = null; private reloadInterval: number = null;
constructor(router: Router, i18nService: I18nService, constructor(router: Router, i18nService: I18nService,
@ -35,7 +34,8 @@ export class LockComponent extends BaseLockComponent implements OnInit, OnDestro
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService); super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService);
} }
ngOnInit() { async ngOnInit() {
await super.ngOnInit();
this.route.queryParams.subscribe((params) => { this.route.queryParams.subscribe((params) => {
if (params.refresh === 'true') { if (params.refresh === 'true') {
// Refresh the renderer window when locked to enure that all purged memory is cleaned up // Refresh the renderer window when locked to enure that all purged memory is cleaned up

View File

@ -734,6 +734,15 @@
"unlock": { "unlock": {
"message": "Unlock" "message": "Unlock"
}, },
"loggedInAs": {
"message": "Logged in as $EMAIL$.",
"placeholders": {
"email": {
"content": "$1",
"example": "name@example.com"
}
}
},
"invalidMasterPassword": { "invalidMasterPassword": {
"message": "Invalid master password" "message": "Invalid master password"
}, },