From 701f6be00c834bad49ba5d7e36899c53134e793b Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Thu, 8 Aug 2019 15:36:36 +1000 Subject: [PATCH] Add missing mnemonic languages --- js/views/standalone_registration_view.js | 9 ++++- libloki/modules/mnemonic.js | 44 +++++++++++++----------- stylesheets/_global.scss | 2 +- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/js/views/standalone_registration_view.js b/js/views/standalone_registration_view.js index 54d5706a4..ce68b7358 100644 --- a/js/views/standalone_registration_view.js +++ b/js/views/standalone_registration_view.js @@ -30,11 +30,18 @@ this.onGenerateMnemonic(); const options = window.mnemonic.get_languages().map(language => { - const text = language.charAt(0).toUpperCase() + language.slice(1); + const text = language + // Split by whitespace or underscore + .split(/[\s_]+/) + // Capitalise each word + .map(word => word.charAt(0).toUpperCase() + word.slice(1)) + .join(' '); return ``; }); this.$('#mnemonic-language').append(options); + this.$('#mnemonic-language').val('english'); this.$('#mnemonic-display-language').append(options); + this.$('#mnemonic-display-language').val('english'); this.$passwordInput = this.$('#password'); this.$passwordConfirmationInput = this.$('#password-confirmation'); diff --git a/libloki/modules/mnemonic.js b/libloki/modules/mnemonic.js index aeb793f8e..84b14b382 100644 --- a/libloki/modules/mnemonic.js +++ b/libloki/modules/mnemonic.js @@ -148,29 +148,31 @@ function mn_decode(str, wordset_name) { return out; } -var mn_words = { - english: { - prefix_len: 3, - words: require('../../mnemonic_languages/english'), - }, - electrum: { - prefix_len: 0, - words: require('../../mnemonic_languages/electrum'), - }, - spanish: { - prefix_len: 4, - words: require('../../mnemonic_languages/spanish'), - }, - portuguese: { - prefix_len: 4, - words: require('../../mnemonic_languages/portuguese'), - }, - japanese: { - prefix_len: 3, - words: require('../../mnemonic_languages/japanese'), - }, +// Note: the value is the prefix_len +const languages = { + chinese_simplified: 1, + dutch: 4, + electrum: 0, + english: 3, + esperanto: 4, + french: 4, + german: 4, + italian: 4, + japanese: 3, + lojban: 4, + portuguese: 4, + russian: 4, + spanish: 4, }; +let mn_words = {}; +for (let [language, prefix_len] of Object.entries(languages)) { + mn_words[language] = { + prefix_len, + words: require(`../../mnemonic_languages/${language}`), + }; +} + function get_languages() { return Object.keys(mn_words); } diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss index a928ad882..4946c4b58 100644 --- a/stylesheets/_global.scss +++ b/stylesheets/_global.scss @@ -759,7 +759,7 @@ $loading-height: 16px; .select-container { position: relative; display: block; - width: 9em; + width: 13em; line-height: 2.8; background: white; overflow: hidden;