Merge pull request #1914

31616af3 Fixes #1850 - Add French mnemonics wordlist (assylias)
This commit is contained in:
Riccardo Spagni 2017-03-24 14:34:07 +02:00
commit 20387386b9
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 1699 additions and 0 deletions

View file

@ -34,6 +34,7 @@ set(mnemonics_headers)
set(mnemonics_private_headers set(mnemonics_private_headers
electrum-words.h electrum-words.h
english.h english.h
french.h
german.h german.h
italian.h italian.h
japanese.h japanese.h

View file

@ -52,6 +52,7 @@
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include "english.h" #include "english.h"
#include "french.h"
#include "italian.h" #include "italian.h"
#include "german.h" #include "german.h"
#include "spanish.h" #include "spanish.h"
@ -83,6 +84,7 @@ namespace
// If there's a new language added, add an instance of it here. // If there's a new language added, add an instance of it here.
std::vector<Language::Base*> language_instances({ std::vector<Language::Base*> language_instances({
Language::Singleton<Language::English>::instance(), Language::Singleton<Language::English>::instance(),
Language::Singleton<Language::French>::instance(),
Language::Singleton<Language::Spanish>::instance(), Language::Singleton<Language::Spanish>::instance(),
Language::Singleton<Language::German>::instance(), Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::Italian>::instance(), Language::Singleton<Language::Italian>::instance(),
@ -312,6 +314,10 @@ namespace crypto
{ {
language = Language::Singleton<Language::English>::instance(); language = Language::Singleton<Language::English>::instance();
} }
else if (language_name == "French")
{
language = Language::Singleton<Language::French>::instance();
}
else if (language_name == "Spanish") else if (language_name == "Spanish")
{ {
language = Language::Singleton<Language::Spanish>::instance(); language = Language::Singleton<Language::Spanish>::instance();
@ -382,6 +388,7 @@ namespace crypto
{ {
std::vector<Language::Base*> language_instances({ std::vector<Language::Base*> language_instances({
Language::Singleton<Language::English>::instance(), Language::Singleton<Language::English>::instance(),
Language::Singleton<Language::French>::instance(),
Language::Singleton<Language::Spanish>::instance(), Language::Singleton<Language::Spanish>::instance(),
Language::Singleton<Language::German>::instance(), Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::Italian>::instance(), Language::Singleton<Language::Italian>::instance(),

1691
src/mnemonics/french.h Normal file

File diff suppressed because it is too large Load diff