Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-06-28 10:55:27 +02:00
Code Issues Projects Releases Wiki Activity

Resolve review comments

Browse Source
This commit is contained in:
Hinton 2020-11-19 19:16:29 +01:00
parent e9f7834a00
commit 6257764c37
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/_locales/en/messages.json
View File

@ -1250,14 +1250,14 @@
"yourVaultIsLockedPinCode": { "yourVaultIsLockedPinCode": {
"message": "Your vault is locked. Verify your PIN code to continue." "message": "Your vault is locked. Verify your PIN code to continue."
}, },
"unlockWithBiometric": { "unlockWithBiometrics": {
"message": "Unlock with biometric" "message": "Unlock with biometrics"
}, },
"awaitDesktop": { "awaitDesktop": {
"message": "Awaiting confirmation from desktop" "message": "Awaiting confirmation from desktop"
}, },
"awaitDesktopDesc": { "awaitDesktopDesc": {
"message": "Please confirm using biometrics in the Bitwarden desktop application to enable biometrics for browser." "message": "Please confirm using biometrics in the Bitwarden Desktop application to enable biometrics for browser."
}, },
"lockWithMasterPassOnRestart": { "lockWithMasterPassOnRestart": {
"message": "Lock with master password on browser restart" "message": "Lock with master password on browser restart"
@ -1391,19 +1391,19 @@
"message": "Browser integration is not enabled" "message": "Browser integration is not enabled"
}, },
"desktopIntegrationDisabledDesc": { "desktopIntegrationDisabledDesc": {
"message": "Browser integration is not enabled in the Bitwarden Desktop Application. Please enable it in the settings within the desktop application." "message": "Browser integration is not enabled in the Bitwarden Desktop application. Please enable it in the settings within the desktop application."
}, },
"startDesktopTitle": { "startDesktopTitle": {
"message": "Start the Bitwarden Desktop Application" "message": "Start the Bitwarden Desktop application"
}, },
"startDesktopDesc": { "startDesktopDesc": {
"message": "The bitwarden desktop application needs to be started before this function can be used." "message": "The Bitwarden Desktop application needs to be started before this function can be used."
}, },
"errorEnableBiometricTitle": { "errorEnableBiometricTitle": {
"message": "Unable to enable biometrics" "message": "Unable to enable biometrics"
}, },
"errorEnableBiometricDesc": { "errorEnableBiometricDesc": {
"message": "Action was canceld by the desktop applicaiton." "message": "Action was canceled by the desktop application"
}, },
"nativeMessagingInvalidEncryptionDesc": { "nativeMessagingInvalidEncryptionDesc": {
"message": "Desktop application invalidated the secure communication channel. Please retry this operation" "message": "Desktop application invalidated the secure communication channel. Please retry this operation"

8
src/background/nativeMessaging.background.ts
View File

@ -66,7 +66,7 @@ export class NativeMessagingBackground {
this.sharedSecret = null; this.sharedSecret = null;
this.privateKey = null; this.privateKey = null;
this.connected = false; this.connected = false;
this.messagingService.send('showDialog', { this.messagingService.send('showDialog', {
text: this.i18nService.t('nativeMessagingInvalidEncryptionDesc'), text: this.i18nService.t('nativeMessagingInvalidEncryptionDesc'),
title: this.i18nService.t('nativeMessagingInvalidEncryptionTitle'), title: this.i18nService.t('nativeMessagingInvalidEncryptionTitle'),
@ -86,7 +86,9 @@ export class NativeMessagingBackground {
error = chrome.runtime.lastError.message; error = chrome.runtime.lastError.message;
} }
if (error === 'Specified native messaging host not found.' || error === 'Access to the specified native messaging host is forbidden.' || error === 'An unexpected error occurred') { if (error === 'Specified native messaging host not found.' ||
error === 'Access to the specified native messaging host is forbidden.' ||
error === 'An unexpected error occurred') {
this.messagingService.send('showDialog', { this.messagingService.send('showDialog', {
text: this.i18nService.t('desktopIntegrationDisabledDesc'), text: this.i18nService.t('desktopIntegrationDisabledDesc'),
title: this.i18nService.t('desktopIntegrationDisabledTitle'), title: this.i18nService.t('desktopIntegrationDisabledTitle'),
@ -157,7 +159,7 @@ export class NativeMessagingBackground {
break; break;
default: default:
// tslint:disable-next-line // tslint:disable-next-line
console.error('NativeMessage, got unknown command.'); console.error('NativeMessage, got unknown command: ', message.command);
} }
if (this.resolver) { if (this.resolver) {

2
src/popup/accounts/lock.component.html
View File

@ -38,7 +38,7 @@
</div> </div>
<div class="box" *ngIf="biometricLock"> <div class="box" *ngIf="biometricLock">
<div class="box-footer"> <div class="box-footer">
<a class="btn primary block" (click)="unlockBiometric()">Unlock with biometry</a> <a class="btn primary block" (click)="unlockBiometric()">{{'unlockWithBiometrics' | i18n}}</a>
</div> </div>
</div> </div>
<p class="text-center"> <p class="text-center">

2
src/popup/settings/settings.component.html
View File

@ -43,7 +43,7 @@
<input id="pin" type="checkbox" (change)="updatePin()" [(ngModel)]="pin"> <input id="pin" type="checkbox" (change)="updatePin()" [(ngModel)]="pin">
</div> </div>
<div class="box-content-row box-content-row-checkbox" appBoxRow> <div class="box-content-row box-content-row-checkbox" appBoxRow>
<label for="biometric">{{'unlockWithBiometric' | i18n}}</label> <label for="biometric">{{'unlockWithBiometrics' | i18n}}</label>
<input id="biometric" type="checkbox" (change)="updateBiometric()" [checked]="biometric"> <input id="biometric" type="checkbox" (change)="updateBiometric()" [checked]="biometric">
</div> </div>
<a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick