1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-25 16:59:17 +01:00

Merge pull request #2421 from bitwarden/Feature/ExportWarnings

[feature] Implement scope warning for exports
This commit is contained in:
Addison Beck 2022-02-28 11:44:36 -05:00 committed by GitHub
commit 19246c0e13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions

View File

@ -1872,5 +1872,17 @@
},
"sessionTimeout": {
"message": "Your session has timed out. Please go back and try logging in again."
},
"exportingPersonalVaultTitle": {
"message": "Exporting Personal Vault"
},
"exportingPersonalVaultDescription": {
"message": "Only the personal vault items associated with $EMAIL$ will be exported. Organization vault items will not be included.",
"placeholders": {
"email": {
"content": "$1",
"example": "name@example.com"
}
}
}
}

View File

@ -59,6 +59,7 @@ import { BrowserModule } from "@angular/platform-browser";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { CalloutComponent } from "jslib-angular/components/callout.component";
import { ExportScopeCalloutComponent } from "jslib-angular/components/export-scope-callout.component";
import { IconComponent } from "jslib-angular/components/icon.component";
import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive";
@ -221,6 +222,7 @@ registerLocaleData(localeZhTw, "zh-TW");
EnvironmentComponent,
ExcludedDomainsComponent,
ExportComponent,
ExportScopeCalloutComponent,
FallbackSrcDirective,
FolderAddEditComponent,
FoldersComponent,

View File

@ -19,6 +19,7 @@
<app-callout type="warning" title="{{ 'vaultExportDisabled' | i18n }}" *ngIf="disabledByPolicy">
{{ "personalVaultExportPolicyInEffect" | i18n }}
</app-callout>
<app-export-scope-callout *ngIf="!disabledByPolicy"></app-export-scope-callout>
<div class="box">
<div class="box-content">