1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00

improt instructions

This commit is contained in:
Kyle Spearrin 2018-06-25 15:47:05 -04:00
parent e59277742d
commit 9b67f6e398
3 changed files with 45 additions and 0 deletions

View File

@ -12,6 +12,29 @@
<option *ngFor="let o of importOptions" [ngValue]="o.id">{{o.name}}</option>
</select>
</div>
</div>
</div>
<div class="alert alert-info" role="alert" *ngIf="format">
<h4 class="alert-heading">{{'instructionsFor' | i18n : getFormatName()}}</h4>
<p class="mb-0">
<ng-container *ngIf="format === 'bitwardencsv'">
See detailed instructions on our help site at
<a target="_blank" href="https://help.bitwarden.com/article/export-your-data/">https://help.bitwarden.com/article/export-your-data/</a>
</ng-container>
<ng-container *ngIf="format === 'lastpasscsv'">
See detailed instructions on our help site at
<a target="_blank" href="https://help.bitwarden.com/article/import-from-lastpass/">https://help.bitwarden.com/article/import-from-lastpass/</a>
</ng-container>
<ng-container *ngIf="format === 'keepassxcsv'">
Using the KeePassX desktop application, navigate to "Database" &rarr; "Export to CSV file" and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'aviracsv'">
In the Avira web vault, go to "Settings" &rarr; "My Data" &rarr; "Export data" and save the CSV file.
</ng-container>
</p>
</div>
<div class="row">
<div class="col-6">
<div class="form-group">
<label for="file">2. {{'selectImportFile' | i18n}}</label>
<input type="file" id="file" class="form-control-file" name="file">

View File

@ -165,6 +165,18 @@ export class ImportComponent {
}
}
getFormatName() {
if (this.format == null) {
return null;
}
const results = this.featuredImportOptions.concat(this.importOptions).filter((o) => o.id === this.format);
if (results.length > 0) {
return results[0].name;
}
return null;
}
private getFileContents(file: File): Promise<string> {
return new Promise((resolve, reject) => {
const reader = new FileReader();

View File

@ -883,5 +883,15 @@
},
"orCopyPasteFileContents": {
"message": "or copy/paste the import file contents"
},
"instructionsFor": {
"message": "$NAME$ Instructions",
"description": "The title for the import tool instructions.",
"placeholders": {
"name": {
"content": "$1",
"example": "LastPass (csv)"
}
}
}
}