kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2002

Browse source 
12fff108 Change Old_English to English_Old - 'Old English' is actually a language (Nano Akron)
533187f0 Change all wallet language names into native names (and scripts) (Nano Akron)
This commit is contained in:
Riccardo Spagni 2017-05-05 11:29:51 +02:00
parent 28ecac2671 12fff108ea
commit c17102c385
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
14 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mnemonics/CMakeLists.txt
View file

@ -41,7 +41,7 @@ set(mnemonics_private_headers
italian.h
japanese.h
language_base.h
old_english.h
english_old.h
portuguese.h
russian.h
singleton.h

2
src/mnemonics/chinese_simplified.h
View file

@ -72,7 +72,7 @@ namespace Language
class Chinese_Simplified: public Base
{
public:
Chinese_Simplified(): Base("Chinese (Simplified)", std::vector<std::string>({
Chinese_Simplified(): Base("简体中文 (中国)", std::vector<std::string>({
"的",
"一",
"是",

2
src/mnemonics/dutch.h
View file

@ -49,7 +49,7 @@ namespace Language
class Dutch: public Base
{
public:
Dutch(): Base("Dutch", std::vector<std::string>({
Dutch(): Base("Nederlands", std::vector<std::string>({
"aalglad",
"aalscholver",
"aambeeld",

34
src/mnemonics/electrum-words.cpp
View file

@ -61,7 +61,7 @@
#include "portuguese.h"
#include "japanese.h"
#include "russian.h"
#include "old_english.h"
#include "english_old.h"
#include "language_base.h"
#include "singleton.h"
@ -95,7 +95,7 @@ namespace
Language::Singleton<Language::Portuguese>::instance(),
Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::OldEnglish>::instance()
Language::Singleton<Language::EnglishOld>::instance()
});
Language::Base *fallback = NULL;
@ -318,39 +318,39 @@ namespace crypto
{
language = Language::Singleton<Language::English>::instance();
}
else if (language_name == "Dutch")
else if (language_name == "Nederlands")
{
language = Language::Singleton<Language::Dutch>::instance();
}
else if (language_name == "French")
else if (language_name == "Français")
{
language = Language::Singleton<Language::French>::instance();
}
else if (language_name == "Spanish")
else if (language_name == "Español")
{
language = Language::Singleton<Language::Spanish>::instance();
}
else if (language_name == "Portuguese")
else if (language_name == "Português")
{
language = Language::Singleton<Language::Portuguese>::instance();
}
else if (language_name == "Japanese")
else if (language_name == "日本語")
{
language = Language::Singleton<Language::Japanese>::instance();
}
else if (language_name == "Italian")
else if (language_name == "Italiano")
{
language = Language::Singleton<Language::Italian>::instance();
}
else if (language_name == "German")
else if (language_name == "Deutsch")
{
language = Language::Singleton<Language::German>::instance();
}
else if (language_name == "Russian")
else if (language_name == "русский язык")
{
language = Language::Singleton<Language::Russian>::instance();
}
else if (language_name == "Chinese (Simplified)")
else if (language_name == "简体中文 (中国)")
{
language = Language::Singleton<Language::Chinese_Simplified>::instance();
}
@ -399,16 +399,16 @@ 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(),
Language::Singleton<Language::Spanish>::instance(),
Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::English>::instance(),
Language::Singleton<Language::Spanish>::instance(),
Language::Singleton<Language::French>::instance(),
Language::Singleton<Language::Italian>::instance(),
Language::Singleton<Language::Dutch>::instance(),
Language::Singleton<Language::Portuguese>::instance(),
Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::Japanese>::instance()
Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::Chinese_Simplified>::instance()
});
for (std::vector<Language::Base*>::iterator it = language_instances.begin();
it != language_instances.end(); it++)

2
src/mnemonics/electrum-words.h
View file

@ -60,7 +60,7 @@ namespace crypto
{
const int seed_length = 24;
const std::string old_language_name = "OldEnglish";
const std::string old_language_name = "EnglishOld";
/*!
* \brief Converts seed words to bytes (secret key).
* \param words String containing the words separated by spaces.

12
src/mnemonics/old_english.h → src/mnemonics/english_old.h
View file

@ -29,13 +29,13 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*!
* \file old_english.h
* \file english_old.h
*
* \brief Old English word list and map.
* \brief Older version of English word list and map.
*/
#ifndef OLD_ENGLISH_H
#define OLD_ENGLISH_H
#ifndef ENGLISH_OLD_H
#define ENGLISH_OLD_H
#include <vector>
#include <unordered_map>
@ -48,10 +48,10 @@
*/
namespace Language
{
class OldEnglish: public Base
class EnglishOld: public Base
{
public:
OldEnglish(): Base("OldEnglish", std::vector<std::string>({
EnglishOld(): Base("EnglishOld", std::vector<std::string>({
"like",
"just",
"love",

2
src/mnemonics/french.h
View file

@ -49,7 +49,7 @@ namespace Language
class French: public Base
{
public:
French(): Base("French", std::vector<std::string>({
French(): Base("Français", std::vector<std::string>({
"abandon",
"abattre",
"aboi",

8
src/mnemonics/german.h
View file

@ -51,7 +51,7 @@ namespace Language
class German: public Base
{
public:
German(): Base("German", std::vector<std::string>({
German(): Base("Deutsch", std::vector<std::string>({
"Abakus",
"Abart",
"abbilden",
@ -1678,11 +1678,11 @@ namespace Language
"Zündung",
"Zweck",
"Zyklop"
}), 4)
{
}), 4)
{
populate_maps();
}
};
}
#endif
#endif

8
src/mnemonics/italian.h
View file

@ -51,7 +51,7 @@ namespace Language
class Italian: public Base
{
public:
Italian(): Base("Italian", std::vector<std::string>({
Italian(): Base("Italiano", std::vector<std::string>({
"abbinare",
"abbonato",
"abisso",
@ -1678,11 +1678,11 @@ namespace Language
"zolfo",
"zombie",
"zucchero"
}), 4)
{
}), 4)
{
populate_maps();
}
};
}
#endif
#endif

2
src/mnemonics/japanese.h
View file

@ -71,7 +71,7 @@ namespace Language
class Japanese: public Base
{
public:
Japanese(): Base("Japanese", std::vector<std::string>({
Japanese(): Base("日本語", std::vector<std::string>({
"あいこくしん",
"あいさつ",
"あいだ",

2
src/mnemonics/portuguese.h
View file

@ -72,7 +72,7 @@ namespace Language
class Portuguese: public Base
{
public:
Portuguese(): Base("Portuguese", std::vector<std::string>({
Portuguese(): Base("Português", std::vector<std::string>({
"abaular",
"abdominal",
"abeto",

8
src/mnemonics/russian.h
View file

@ -51,7 +51,7 @@ namespace Language
class Russian: public Base
{
public:
Russian(): Base("Russian", std::vector<std::string>({
Russian(): Base("русский язык", std::vector<std::string>({
"абажур",
"абзац",
"абонент",
@ -1678,11 +1678,11 @@ namespace Language
"яхта",
"ячейка",
"ящик"
}), 4)
{
}), 4)
{
populate_maps();
}
};
}
#endif
#endif

2
src/mnemonics/spanish.h
View file

@ -72,7 +72,7 @@ namespace Language
class Spanish: public Base
{
public:
Spanish(): Base("Spanish", std::vector<std::string>({
Spanish(): Base("Español", std::vector<std::string>({
"ábaco",
"abdomen",
"abeja",

2
tests/unit_tests/mnemonics.cpp
View file

@ -44,7 +44,7 @@
#include "mnemonics/russian.h"
#include "mnemonics/french.h"
#include "mnemonics/dutch.h"
#include "mnemonics/old_english.h"
#include "mnemonics/english_old.h"
#include "mnemonics/language_base.h"
#include "mnemonics/singleton.h"