From 54025f269ac4b8733a0ba9d572ed55df5319fe91 Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Mon, 28 Feb 2022 11:44:10 -0500 Subject: [PATCH] [feature] Implement scope warning for exports (#1384) --- src/app/app.module.ts | 2 ++ src/app/vault/export.component.html | 1 + src/locales/en/messages.json | 12 ++++++++++++ 3 files changed, 15 insertions(+) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f4d1f62d..1442478f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -56,6 +56,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { AvatarComponent } from "jslib-angular/components/avatar.component"; 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"; @@ -197,6 +198,7 @@ registerLocaleData(localeZhTw, "zh-TW"); ColorPasswordPipe, EnvironmentComponent, ExportComponent, + ExportScopeCalloutComponent, FallbackSrcDirective, FolderAddEditComponent, GroupingsComponent, diff --git a/src/app/vault/export.component.html b/src/app/vault/export.component.html index c069b851..f733a845 100644 --- a/src/app/vault/export.component.html +++ b/src/app/vault/export.component.html @@ -9,6 +9,7 @@ > {{ "personalVaultExportPolicyInEffect" | i18n }} +
{{ "exportVault" | i18n }} diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index c4f04b22..0d899c25 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1816,5 +1816,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" + } + } } }