Merge pull request #352

1d1a77b slight modification to wordlist contributor tagline (as these contributors haven't used git to submit a PR, so we're creating the wordlist on their behalf (Riccardo Spagni)
ef7671a added Russian wordlist (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2015-07-24 07:56:48 +02:00
commit 40e703c87c
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 1703 additions and 2 deletions

View file

@ -40,6 +40,7 @@ set(mnemonics_private_headers
language_base.h language_base.h
old_english.h old_english.h
portuguese.h portuguese.h
russian.h
singleton.h singleton.h
spanish.h) spanish.h)

View file

@ -57,6 +57,7 @@
#include "spanish.h" #include "spanish.h"
#include "portuguese.h" #include "portuguese.h"
#include "japanese.h" #include "japanese.h"
#include "russian.h"
#include "old_english.h" #include "old_english.h"
#include "language_base.h" #include "language_base.h"
#include "singleton.h" #include "singleton.h"
@ -84,6 +85,7 @@ namespace
Language::Singleton<Language::Italian>::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::Russian>::instance(),
Language::Singleton<Language::OldEnglish>::instance() Language::Singleton<Language::OldEnglish>::instance()
}); });
@ -305,6 +307,10 @@ namespace crypto
{ {
language = Language::Singleton<Language::German>::instance(); language = Language::Singleton<Language::German>::instance();
} }
else if (language_name == "Russian")
{
language = Language::Singleton<Language::Russian>::instance();
}
else else
{ {
return false; return false;
@ -355,6 +361,7 @@ namespace crypto
Language::Singleton<Language::German>::instance(), Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::Italian>::instance(), Language::Singleton<Language::Italian>::instance(),
Language::Singleton<Language::Portuguese>::instance(), Language::Singleton<Language::Portuguese>::instance(),
Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::Japanese>::instance() Language::Singleton<Language::Japanese>::instance()
}); });
for (std::vector<Language::Base*>::iterator it = language_instances.begin(); for (std::vector<Language::Base*>::iterator it = language_instances.begin();

View file

@ -1,4 +1,4 @@
// Word list originally created by Shrikez // Word list created by Monero contributor Shrikez
// //
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2015, The Monero Project
// //

View file

@ -1,4 +1,4 @@
// Word list originally created by Shrikez // Word list created by Monero contributor Shrikez
// //
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2015, The Monero Project
// //

1693
src/mnemonics/russian.h Normal file

File diff suppressed because it is too large Load diff