From 533187f0c3c6730b1a48c200872d7c9793cdede2 Mon Sep 17 00:00:00 2001 From: Nano Akron Date: Sun, 16 Apr 2017 12:34:49 +0100 Subject: [PATCH] Change all wallet language names into native names (and scripts) --- src/mnemonics/chinese_simplified.h | 2 +- src/mnemonics/dutch.h | 2 +- src/mnemonics/electrum-words.cpp | 30 +++++++++++++++--------------- src/mnemonics/french.h | 2 +- src/mnemonics/german.h | 8 ++++---- src/mnemonics/italian.h | 8 ++++---- src/mnemonics/japanese.h | 2 +- src/mnemonics/portuguese.h | 2 +- src/mnemonics/russian.h | 8 ++++---- src/mnemonics/spanish.h | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/mnemonics/chinese_simplified.h b/src/mnemonics/chinese_simplified.h index 413186733..a85bbe963 100644 --- a/src/mnemonics/chinese_simplified.h +++ b/src/mnemonics/chinese_simplified.h @@ -72,7 +72,7 @@ namespace Language class Chinese_Simplified: public Base { public: - Chinese_Simplified(): Base("Chinese (Simplified)", std::vector({ + Chinese_Simplified(): Base("简体中文 (中国)", std::vector({ "的", "一", "是", diff --git a/src/mnemonics/dutch.h b/src/mnemonics/dutch.h index 0d7a637e6..1cf9b606e 100644 --- a/src/mnemonics/dutch.h +++ b/src/mnemonics/dutch.h @@ -49,7 +49,7 @@ namespace Language class Dutch: public Base { public: - Dutch(): Base("Dutch", std::vector({ + Dutch(): Base("Nederlands", std::vector({ "aalglad", "aalscholver", "aambeeld", diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp index 501495f0b..c7c86f08d 100644 --- a/src/mnemonics/electrum-words.cpp +++ b/src/mnemonics/electrum-words.cpp @@ -318,39 +318,39 @@ namespace crypto { language = Language::Singleton::instance(); } - else if (language_name == "Dutch") + else if (language_name == "Nederlands") { language = Language::Singleton::instance(); } - else if (language_name == "French") + else if (language_name == "Français") { language = Language::Singleton::instance(); } - else if (language_name == "Spanish") + else if (language_name == "Español") { language = Language::Singleton::instance(); } - else if (language_name == "Portuguese") + else if (language_name == "Português") { language = Language::Singleton::instance(); } - else if (language_name == "Japanese") + else if (language_name == "日本語") { language = Language::Singleton::instance(); } - else if (language_name == "Italian") + else if (language_name == "Italiano") { language = Language::Singleton::instance(); } - else if (language_name == "German") + else if (language_name == "Deutsch") { language = Language::Singleton::instance(); } - else if (language_name == "Russian") + else if (language_name == "русский язык") { language = Language::Singleton::instance(); } - else if (language_name == "Chinese (Simplified)") + else if (language_name == "简体中文 (中国)") { language = Language::Singleton::instance(); } @@ -399,16 +399,16 @@ namespace crypto void get_language_list(std::vector &languages) { std::vector language_instances({ - Language::Singleton::instance(), - Language::Singleton::instance(), - Language::Singleton::instance(), - Language::Singleton::instance(), - Language::Singleton::instance(), Language::Singleton::instance(), + Language::Singleton::instance(), + Language::Singleton::instance(), + Language::Singleton::instance(), Language::Singleton::instance(), + Language::Singleton::instance(), Language::Singleton::instance(), Language::Singleton::instance(), - Language::Singleton::instance() + Language::Singleton::instance(), + Language::Singleton::instance() }); for (std::vector::iterator it = language_instances.begin(); it != language_instances.end(); it++) diff --git a/src/mnemonics/french.h b/src/mnemonics/french.h index 6cf44a197..ef951b2cc 100644 --- a/src/mnemonics/french.h +++ b/src/mnemonics/french.h @@ -49,7 +49,7 @@ namespace Language class French: public Base { public: - French(): Base("French", std::vector({ + French(): Base("Français", std::vector({ "abandon", "abattre", "aboi", diff --git a/src/mnemonics/german.h b/src/mnemonics/german.h index 1a1e6b467..46a8cf1fe 100644 --- a/src/mnemonics/german.h +++ b/src/mnemonics/german.h @@ -51,7 +51,7 @@ namespace Language class German: public Base { public: - German(): Base("German", std::vector({ + German(): Base("Deutsch", std::vector({ "Abakus", "Abart", "abbilden", @@ -1678,11 +1678,11 @@ namespace Language "Zündung", "Zweck", "Zyklop" - }), 4) - { + }), 4) + { populate_maps(); } }; } -#endif +#endif diff --git a/src/mnemonics/italian.h b/src/mnemonics/italian.h index 28cee9d9a..da0e1363c 100644 --- a/src/mnemonics/italian.h +++ b/src/mnemonics/italian.h @@ -51,7 +51,7 @@ namespace Language class Italian: public Base { public: - Italian(): Base("Italian", std::vector({ + Italian(): Base("Italiano", std::vector({ "abbinare", "abbonato", "abisso", @@ -1678,11 +1678,11 @@ namespace Language "zolfo", "zombie", "zucchero" - }), 4) - { + }), 4) + { populate_maps(); } }; } -#endif +#endif diff --git a/src/mnemonics/japanese.h b/src/mnemonics/japanese.h index d5ab4bc84..fd5425fb1 100644 --- a/src/mnemonics/japanese.h +++ b/src/mnemonics/japanese.h @@ -71,7 +71,7 @@ namespace Language class Japanese: public Base { public: - Japanese(): Base("Japanese", std::vector({ + Japanese(): Base("日本語", std::vector({ "あいこくしん", "あいさつ", "あいだ", diff --git a/src/mnemonics/portuguese.h b/src/mnemonics/portuguese.h index f9d66afc4..bb1fe8ee5 100644 --- a/src/mnemonics/portuguese.h +++ b/src/mnemonics/portuguese.h @@ -72,7 +72,7 @@ namespace Language class Portuguese: public Base { public: - Portuguese(): Base("Portuguese", std::vector({ + Portuguese(): Base("Português", std::vector({ "abaular", "abdominal", "abeto", diff --git a/src/mnemonics/russian.h b/src/mnemonics/russian.h index b3db4aa4c..bfe970b9d 100644 --- a/src/mnemonics/russian.h +++ b/src/mnemonics/russian.h @@ -51,7 +51,7 @@ namespace Language class Russian: public Base { public: - Russian(): Base("Russian", std::vector({ + Russian(): Base("русский язык", std::vector({ "абажур", "абзац", "абонент", @@ -1678,11 +1678,11 @@ namespace Language "яхта", "ячейка", "ящик" - }), 4) - { + }), 4) + { populate_maps(); } }; } -#endif +#endif diff --git a/src/mnemonics/spanish.h b/src/mnemonics/spanish.h index 117890ada..9db2a03f3 100644 --- a/src/mnemonics/spanish.h +++ b/src/mnemonics/spanish.h @@ -72,7 +72,7 @@ namespace Language class Spanish: public Base { public: - Spanish(): Base("Spanish", std::vector({ + Spanish(): Base("Español", std::vector({ "ábaco", "abdomen", "abeja",