Change all wallet language names into native names (and scripts)

10 files changed, 32 insertions, 32 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<std::string>({

+    Chinese_Simplified(): Base("简体中文 (中国)", std::vector<std::string>({

       "的",

       "一",

       "是",

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<std::string>({

+    Dutch(): Base("Nederlands", std::vector<std::string>({

         "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<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::German>::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::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++)
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<std::string>({
+    French(): Base("Français", std::vector<std::string>({
         "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<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

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<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

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<std::string>({

+    Japanese(): Base("日本語", std::vector<std::string>({

         "あいこくしん",

         "あいさつ",

         "あいだ",

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<std::string>({

+    Portuguese(): Base("Português", std::vector<std::string>({

         "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<std::string>({

+    Russian(): Base("русский язык", std::vector<std::string>({

         "абажур",

         "абзац",

         "абонент",

@@ -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<std::string>({

+    Spanish(): Base("Español", std::vector<std::string>({

         "ábaco",

         "abdomen",

         "abeja",