Language switch for xkcd (gopasspw#406)

action/generate.go

@@ -86,7 +86,10 @@ func (s *Action) Generate(ctx context.Context, c *cli.Context) error {
 
 	var password string
 	if xkcd {
-		password = xkcdgen.RandomLengthDelim(pwlen, xkcdSeparator)
+		password, err = xkcdgen.RandomLengthDelim(pwlen, xkcdSeparator, c.String("xkcdlang"))
+		if err != nil {
+			return err
+		}
 	} else {
 		password = pwgen.GeneratePassword(pwlen, symbols)
 	}

main.go

@@ -517,6 +517,11 @@ func main() {
 					Usage: "Word separator for generated xkcd style password. Implies -xkcd",
 					Value: "",
 				},
+				cli.StringFlag{
+					Name:  "xkcdlang, xl",
+					Usage: "Language to generate password from, currently de (german) and en (english, default) are supported",
+					Value: "en",
+				},
 			},
 		},
 		{

utils/pwgen/xkcdgen/pwgen.go

@@ -4,21 +4,25 @@ import "github.com/martinhoefling/goxkcdpwgen/xkcdpwgen"
 
 // Random returns a random passphrase combined from four words
 func Random() string {
-	return RandomLength(4)
+	password, _ := RandomLength(4, "en")
+	return password
 }
 
 // RandomLength returns a random passphrase combined from the desired number
 // of words
-func RandomLength(length int) string {
-	return RandomLengthDelim(length, " ")
+func RandomLength(length int, lang string) (string, error) {
+	return RandomLengthDelim(length, " ", lang)
 }
 
 // RandomLengthDelim returns a random passphrase combined from the desired number
-// of words and the given delimiter
-func RandomLengthDelim(length int, delim string) string {
+// of words and the given delimiter. Words are drawn from lang
+func RandomLengthDelim(length int, delim, lang string) (string, error) {
 	g := xkcdpwgen.NewGenerator()
 	g.SetNumWords(length)
 	g.SetDelimiter(delim)
 	g.SetCapitalize(delim == "")
-	return string(g.GeneratePassword())
+	if err := g.UseLangWordlist(lang); err != nil {
+		return "", err
+	}
+	return string(g.GeneratePassword()), nil
 }