diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-24 14:34:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-24 14:34:07 +0200 |
| commit | 20387386b9c4a869cb709a2dadb257ed2a1acb72 (patch) | |
| tree | 4e44c3efb7e6c176edd8c5cc767e3c4aca16c7d2 /src/mnemonics/electrum-words.cpp | |
| parent | Merge pull request #1894 (diff) | |
| parent | Fixes #1850 - Add French mnemonics wordlist (diff) | |
| download | monero-20387386b9c4a869cb709a2dadb257ed2a1acb72.tar.xz | |
Merge pull request #1914
31616af3 Fixes #1850 - Add French mnemonics wordlist (assylias)
Diffstat (limited to 'src/mnemonics/electrum-words.cpp')
| -rw-r--r-- | src/mnemonics/electrum-words.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp index 67ecbbb37..318e2dc2f 100644 --- a/src/mnemonics/electrum-words.cpp +++ b/src/mnemonics/electrum-words.cpp @@ -52,6 +52,7 @@ #include <boost/algorithm/string/join.hpp> #include "english.h" +#include "french.h" #include "italian.h" #include "german.h" #include "spanish.h" @@ -83,6 +84,7 @@ namespace // If there's a new language added, add an instance of it here. std::vector<Language::Base*> language_instances({ Language::Singleton<Language::English>::instance(), + Language::Singleton<Language::French>::instance(), Language::Singleton<Language::Spanish>::instance(), Language::Singleton<Language::German>::instance(), Language::Singleton<Language::Italian>::instance(), @@ -312,6 +314,10 @@ namespace crypto { language = Language::Singleton<Language::English>::instance(); } + else if (language_name == "French") + { + language = Language::Singleton<Language::French>::instance(); + } else if (language_name == "Spanish") { language = Language::Singleton<Language::Spanish>::instance(); @@ -382,6 +388,7 @@ namespace crypto { std::vector<Language::Base*> language_instances({ Language::Singleton<Language::English>::instance(), + Language::Singleton<Language::French>::instance(), Language::Singleton<Language::Spanish>::instance(), Language::Singleton<Language::German>::instance(), Language::Singleton<Language::Italian>::instance(), |