Merge pull request #349

6d6a985 add Germany and Italian wordlists (Riccardo Spagni)
514047d fix portuguese wordlist (Riccardo Spagni)
b5c0308 fix license on English wordlist (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2015-07-22 22:21:28 +02:00
commit 9e8e958948
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
6 changed files with 3405 additions and 5 deletions

View File

@ -34,6 +34,8 @@ set(mnemonics_headers)
set(mnemonics_private_headers set(mnemonics_private_headers
electrum-words.h electrum-words.h
english.h english.h
german.h
italian.h
japanese.h japanese.h
language_base.h language_base.h
old_english.h old_english.h

View File

@ -52,6 +52,8 @@
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include "english.h" #include "english.h"
#include "italian.h"
#include "german.h"
#include "spanish.h" #include "spanish.h"
#include "portuguese.h" #include "portuguese.h"
#include "japanese.h" #include "japanese.h"
@ -78,6 +80,8 @@ namespace
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::Spanish>::instance(), Language::Singleton<Language::Spanish>::instance(),
Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::Italian>::instance(),
Language::Singleton<Language::Portuguese>::instance(), Language::Singleton<Language::Portuguese>::instance(),
Language::Singleton<Language::Japanese>::instance(), Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::OldEnglish>::instance() Language::Singleton<Language::OldEnglish>::instance()
@ -293,6 +297,14 @@ namespace crypto
{ {
language = Language::Singleton<Language::Japanese>::instance(); language = Language::Singleton<Language::Japanese>::instance();
} }
else if (language_name == "Italian")
{
language = Language::Singleton<Language::Italian>::instance();
}
else if (language_name == "German")
{
language = Language::Singleton<Language::German>::instance();
}
else else
{ {
return false; return false;
@ -340,6 +352,8 @@ 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::Spanish>::instance(), Language::Singleton<Language::Spanish>::instance(),
Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::Italian>::instance(),
Language::Singleton<Language::Portuguese>::instance(), Language::Singleton<Language::Portuguese>::instance(),
Language::Singleton<Language::Japanese>::instance() Language::Singleton<Language::Japanese>::instance()
}); });

View File

@ -1,5 +1,3 @@
// Word list originally created as part of the Electrum project, Copyright (C) 2014 Thomas Voegtlin
//
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2015, The Monero Project
// //
// All rights reserved. // All rights reserved.

1693
src/mnemonics/german.h Normal file

File diff suppressed because it is too large Load Diff

1693
src/mnemonics/italian.h Normal file

File diff suppressed because it is too large Load Diff

View File

@ -587,7 +587,7 @@ namespace Language
"feerico", "feerico",
"feixe", "feixe",
"felicidade", "felicidade",
"felipe", "felpudo",
"feltro", "feltro",
"femur", "femur",
"fenotipo", "fenotipo",
@ -712,7 +712,7 @@ namespace Language
"gume", "gume",
"guru", "guru",
"gustativo", "gustativo",
"gustavo", "grelhado",
"gutural", "gutural",
"habitue", "habitue",
"haitiano", "haitiano",
@ -1334,7 +1334,7 @@ namespace Language
"rins", "rins",
"rios", "rios",
"riqueza", "riqueza",
"riquixa", "respeito",
"rissole", "rissole",
"ritualistico", "ritualistico",
"rivalizar", "rivalizar",