Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 09:39:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2528

Browse Source 
551a8ea6 mnemonics: new Lojban word list (Wei Tang)
This commit is contained in:
Riccardo Spagni 2017-10-15 17:27:58 +02:00
commit 5df4ecbb83
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
4 changed files with 1706 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mnemonics/CMakeLists.txt
View File

@ -46,7 +46,8 @@ set(mnemonics_private_headers
russian.h russian.h
singleton.h singleton.h
spanish.h spanish.h
esperanto.h) esperanto.h
lojban.h)
monero_private_headers(mnemonics monero_private_headers(mnemonics
${mnemonics_private_headers}) ${mnemonics_private_headers})

9
src/mnemonics/electrum-words.cpp
View File

@ -62,6 +62,7 @@
#include "japanese.h" #include "japanese.h"
#include "russian.h" #include "russian.h"
#include "esperanto.h" #include "esperanto.h"
#include "lojban.h"
#include "english_old.h" #include "english_old.h"
#include "language_base.h" #include "language_base.h"
#include "singleton.h" #include "singleton.h"
@ -97,6 +98,7 @@ namespace
Language::Singleton<Language::Japanese>::instance(), Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::Russian>::instance(), Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::Esperanto>::instance(), Language::Singleton<Language::Esperanto>::instance(),
Language::Singleton<Language::Lojban>::instance(),
Language::Singleton<Language::EnglishOld>::instance() Language::Singleton<Language::EnglishOld>::instance()
}); });
Language::Base *fallback = NULL; Language::Base *fallback = NULL;
@ -360,6 +362,10 @@ namespace crypto
{ {
language = Language::Singleton<Language::Esperanto>::instance(); language = Language::Singleton<Language::Esperanto>::instance();
} }
else if (language_name == "Lojban")
{
language = Language::Singleton<Language::Lojban>::instance();
}
else else
{ {
return false; return false;
@ -415,7 +421,8 @@ namespace crypto
Language::Singleton<Language::Russian>::instance(), Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::Japanese>::instance(), Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::Chinese_Simplified>::instance(), Language::Singleton<Language::Chinese_Simplified>::instance(),
Language::Singleton<Language::Esperanto>::instance() Language::Singleton<Language::Esperanto>::instance(),
Language::Singleton<Language::Lojban>::instance()
}); });
for (std::vector<Language::Base*>::iterator it = language_instances.begin(); for (std::vector<Language::Base*>::iterator it = language_instances.begin();
it != language_instances.end(); it++) it != language_instances.end(); it++)

1693
src/mnemonics/lojban.h Normal file
View File

File diff suppressed because it is too large Load Diff

4
tests/unit_tests/mnemonics.cpp
View File

@ -45,6 +45,7 @@
#include "mnemonics/french.h" #include "mnemonics/french.h"
#include "mnemonics/dutch.h" #include "mnemonics/dutch.h"
#include "mnemonics/esperanto.h" #include "mnemonics/esperanto.h"
#include "mnemonics/lojban.h"
#include "mnemonics/english_old.h" #include "mnemonics/english_old.h"
#include "mnemonics/language_base.h" #include "mnemonics/language_base.h"
#include "mnemonics/singleton.h" #include "mnemonics/singleton.h"
@ -167,7 +168,8 @@ TEST(mnemonics, all_languages)
Language::Singleton<Language::Russian>::instance(), Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::French>::instance(), Language::Singleton<Language::French>::instance(),
Language::Singleton<Language::Dutch>::instance(), Language::Singleton<Language::Dutch>::instance(),
Language::Singleton<Language::Esperanto>::instance() Language::Singleton<Language::Esperanto>::instance(),
Language::Singleton<Language::Lojban>::instance()
}); });
for (std::vector<Language::Base*>::iterator it = languages.begin(); it != languages.end(); it++) for (std::vector<Language::Base*>::iterator it = languages.begin(); it != languages.end(); it++)