aboutsummaryrefslogtreecommitdiff
path: root/src/mnemonics/electrum-words.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-04-24 10:49:24 +0200
committerRiccardo Spagni <ric@spagni.net>2017-04-24 10:49:24 +0200
commite53dd76a4925e5157ff43145d9cb0dde7cb35890 (patch)
tree89d15dc973b97a2ba2716bbbc21a548e1ce7bfc6 /src/mnemonics/electrum-words.cpp
parentMerge pull request #1976 (diff)
parentAmended software licenses for Portuguese and Spanish (diff)
downloadmonero-e53dd76a4925e5157ff43145d9cb0dde7cb35890.tar.xz
Merge pull request #1983
72d113dd Amended software licenses for Portuguese and Spanish (Nano Akron) 54bcd260 Added Simplified Chinese electrum word list (Nano Akron)
Diffstat (limited to 'src/mnemonics/electrum-words.cpp')
-rw-r--r--src/mnemonics/electrum-words.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp
index fd2c6a836..5bd06c3e8 100644
--- a/src/mnemonics/electrum-words.cpp
+++ b/src/mnemonics/electrum-words.cpp
@@ -51,6 +51,7 @@
#include <boost/crc.hpp>
#include <boost/algorithm/string/join.hpp>
+#include "chinese_simplified.h"
#include "english.h"
#include "dutch.h"
#include "french.h"
@@ -84,6 +85,7 @@ namespace
{
// If there's a new language added, add an instance of it here.
std::vector<Language::Base*> language_instances({
+ Language::Singleton<Language::Chinese_Simplified>::instance(),
Language::Singleton<Language::English>::instance(),
Language::Singleton<Language::Dutch>::instance(),
Language::Singleton<Language::French>::instance(),
@@ -348,6 +350,10 @@ namespace crypto
{
language = Language::Singleton<Language::Russian>::instance();
}
+ else if (language_name == "Chinese (Simplified)")
+ {
+ language = Language::Singleton<Language::Chinese_Simplified>::instance();
+ }
else
{
return false;
@@ -393,6 +399,7 @@ namespace crypto
void get_language_list(std::vector<std::string> &languages)
{
std::vector<Language::Base*> language_instances({
+ Language::Singleton<Language::Chinese_Simplified>::instance(),
Language::Singleton<Language::English>::instance(),
Language::Singleton<Language::Dutch>::instance(),
Language::Singleton<Language::French>::instance(),