Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-21 16:18:28 +01:00
Code Issues Projects Releases Wiki Activity

SM-569: Update import/export format to Bitwarden (json) (#4944)

Browse Source
This commit is contained in:
Colton Hurst 2023-03-06 17:21:17 -05:00 committed by GitHub
parent 75965e6408
commit 12fe2b693c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts
View File

@ -23,10 +23,10 @@ export class SecretsManagerExportComponent implements OnInit, OnDestroy {
protected orgName: string; protected orgName: string;
protected orgId: string; protected orgId: string;
protected exportFormats: string[] = ["json"]; protected exportFormats: string[] = ["Bitwarden (json)"];
protected formGroup = new FormGroup({ protected formGroup = new FormGroup({
format: new FormControl("json", [Validators.required]), format: new FormControl("Bitwarden (json)", [Validators.required]),
}); });
constructor( constructor(

4
bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
View File

@ -20,7 +20,7 @@
(change)="setSelectedFile($event)" (change)="setSelectedFile($event)"
accept="application/JSON" accept="application/JSON"
/> />
<bit-hint>{{ "acceptedFormats" | i18n }} JSON</bit-hint> <bit-hint>{{ "acceptedFormats" | i18n }} Bitwarden (json)</bit-hint>
</bit-form-field> </bit-form-field>
<div class="my-4"> <div class="my-4">
{{ "or" | i18n }} {{ "or" | i18n }}
@ -34,7 +34,7 @@
name="FileContents" name="FileContents"
formControlName="pastedContents" formControlName="pastedContents"
></textarea> ></textarea>
<bit-hint>{{ "acceptedFormats" | i18n }} JSON</bit-hint> <bit-hint>{{ "acceptedFormats" | i18n }} Bitwarden (json)</bit-hint>
</bit-form-field> </bit-form-field>
<button bitButton bitFormButton type="submit" buttonType="primary"> <button bitButton bitFormButton type="submit" buttonType="primary">
{{ "importData" | i18n }} {{ "importData" | i18n }}