From f9058fcddcc3127bc4fc0e8e2146a653d704bf6c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 8 Oct 2018 22:06:15 -0400
Subject: [PATCH] pass gen fixes. word sep option

---
 jslib                                           |  2 +-
 src/app/tools/password-generator.component.html | 16 ++++++++++------
 src/locales/en/messages.json                    |  3 +++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jslib b/jslib
index d5f86747bf5..a867c14b2a8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit d5f86747bf5533308b271b5fade75a6761f5d4e5
+Subproject commit a867c14b2a8bb5f75cd495018e6c86eff22651b9
diff --git a/src/app/tools/password-generator.component.html b/src/app/tools/password-generator.component.html
index c14fcb12e37..91db335f938 100644
--- a/src/app/tools/password-generator.component.html
+++ b/src/app/tools/password-generator.component.html
@@ -8,23 +8,27 @@
 </div>
 <div class="form-group">
     <div class="form-check">
-        <input id="generate-password" name="generator-type" value="0" class="form-check-input" type="radio" (change)="saveOptions()"
-            [(ngModel)]="type">
+        <input id="generate-password" name="type" value="password" class="form-check-input" type="radio" (change)="saveOptions()"
+            [(ngModel)]="options.type">
         <label for="generate-password">{{'generatePassword' | i18n}}</label>
     </div>
     <div class="form-check">
-        <input id="generate-passphrase" name="generator-type" value="1" class="form-check-input" type="radio" (change)="saveOptions()"
-            [(ngModel)]="type">
+        <input id="generate-passphrase" name="type" value="passphrase" class="form-check-input" type="radio" (change)="saveOptions()"
+            [(ngModel)]="options.type">
         <label for="generate-passphrase">{{'generatePassphrase' | i18n}}</label>
     </div>
 </div>
-<div class="row" *ngIf="type === '1'">
+<div class="row" *ngIf="options.type === 'passphrase'">
     <div class="form-group col-4">
         <label for="num-words">{{'numWords' | i18n}}</label>
         <input id="num-words" class="form-control" type="number" min="3" max="20" [(ngModel)]="options.numWords" (blur)="saveOptions()">
     </div>
+    <div class="form-group col-4">
+        <label for="word-separator">{{'wordSeparator' | i18n}}</label>
+        <input id="word-separator" class="form-control" type="text" maxlength="1" [(ngModel)]="options.wordSeparator" (blur)="saveOptions()">
+    </div>
 </div>
-<ng-container *ngIf="type === '0'">
+<ng-container *ngIf="options.type === 'password'">
     <div class="row">
         <div class="form-group col-4">
             <label for="length">{{'length' | i18n}}</label>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index ef24b4685fc..6de1e843f36 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -804,6 +804,9 @@
   "numWords": {
     "message": "Number of Words"
   },
+  "wordSeparator": {
+    "message": "Word Separator"
+  },
   "passwordHistory": {
     "message": "Password History"
   },