Update translations (#1348)

* Show translations in own tongue

* Fix flake8

* Update

* Update

* Update

* Update

* fix mypy

* Update

* Update

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>

3 files changed, 22 insertions, 34 deletions

diff --git a/archinstall/locales/README.md b/archinstall/locales/README.md
index 70822c05..51662702 100644
--- a/archinstall/locales/README.md
+++ b/archinstall/locales/README.md
@@ -5,7 +5,7 @@ Archinstall supports multiple languages, which depend on translations coming fro
 New languages can be added simply by creating a new folder with the proper language abbrevation (see list `languages.json` if unsure).  
 Run the following command to create a new template for a language
 ```
-    mkdir -p <abbr>/LC_MESSAGES/ && touch <abbr>/LC_MESSAGES/base.po
+mkdir -p <abbr>/LC_MESSAGES/ && touch <abbr>/LC_MESSAGES/base.po
 ```
 
 After that run the script `./locales_generator.sh` it will automatically populate the new `base.po` file with the strings that 
@@ -31,3 +31,10 @@ msgstr "Wollen sie wirklich abbrechen?"
 
 After the translations have been written, run the script once more `./locales_generator.sh` and it will auto-generate the `base.mo` file with the included translations.
 After that you're all ready to go and enjoy Archinstall in the new language :)
+
+To display the language inside Archinstall in your own tongue, please edit the file `languages.json` and 
+add a `translated_lang` entry to the respective language, e.g. 
+
+```
+ {"abbr": "pl", "lang": "Polish", "translated_lang": "Polskie"}
+```
diff --git a/archinstall/locales/cyrillic.json b/archinstall/locales/cyrillic.json
deleted file mode 100644
index 13f11ad0..00000000
--- a/archinstall/locales/cyrillic.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "languages": [
-    "Abkhazian",
-    "Azerbaijani",
-    "Bashkir",
-    "Belarusian",
-    "Bulgarian",
-    "Chuvash",
-    "Komi",
-    "Macedonian",
-    "Mongolian",
-    "Russian",
-    "Serbo-Croatian",
-    "Tajik",
-    "Tatar",
-    "Ukrainian",
-    "Uzbek"
-  ]
-}
diff --git a/archinstall/locales/languages.json b/archinstall/locales/languages.json
index c3c9d2c2..883042e8 100644
--- a/archinstall/locales/languages.json
+++ b/archinstall/locales/languages.json
@@ -20,7 +20,7 @@
  {"abbr": "br", "lang": "Breton"},
  {"abbr": "bg", "lang": "Bulgarian"},
  {"abbr": "ca", "lang": "Catalan"},
- {"abbr": "cs", "lang": "Czech"},
+ {"abbr": "cs", "lang": "Czech", "translated_lang": "čeština"},
  {"abbr": "ch", "lang": "Chamorro"},
  {"abbr": "ce", "lang": "Chechen"},
  {"abbr": "cu", "lang": "Church Slavic"},
@@ -29,8 +29,8 @@
  {"abbr": "co", "lang": "Corsican"},
  {"abbr": "cr", "lang": "Cree"},
  {"abbr": "cy", "lang": "Welsh"},
- {"abbr": "da", "lang": "Danish"},
- {"abbr": "de", "lang": "German"},
+ {"abbr": "da", "lang": "Danish", "translated_lang": "Dansk"},
+ {"abbr": "de", "lang": "German", "translated_lang":  "Deutsch"},
  {"abbr": "dv", "lang": "Dhivehi"},
  {"abbr": "dz", "lang": "Dzongkha"},
  {"abbr": "el", "lang": "Modern Greek (1453-)"},
@@ -43,7 +43,7 @@
  {"abbr": "fa", "lang": "Persian"},
  {"abbr": "fj", "lang": "Fijian"},
  {"abbr": "fi", "lang": "Finnish"},
- {"abbr": "fr", "lang": "French"},
+ {"abbr": "fr", "lang": "French", "translated_lang": "Française"},
  {"abbr": "fy", "lang": "Western Frisian"},
  {"abbr": "ff", "lang": "Fulah"},
  {"abbr": "gd", "lang": "Scottish Gaelic"},
@@ -71,7 +71,7 @@
  {"abbr": "id", "lang": "Indonesian"},
  {"abbr": "ik", "lang": "Inupiaq"},
  {"abbr": "is", "lang": "Icelandic"},
- {"abbr": "it", "lang": "Italian"},
+ {"abbr": "it", "lang": "Italian", "translated_lang":  "Italiano"},
  {"abbr": "jv", "lang": "Javanese"},
  {"abbr": "ja", "lang": "Japanese"},
  {"abbr": "kl", "lang": "Kalaallisut"},
@@ -114,7 +114,7 @@
  {"abbr": "nd", "lang": "North Ndebele"},
  {"abbr": "ng", "lang": "Ndonga"},
  {"abbr": "ne", "lang": "Nepali (macrolanguage)"},
- {"abbr": "nl", "lang": "Dutch"},
+ {"abbr": "nl", "lang": "Dutch", "translated_lang": "Nederlands"},
  {"abbr": "nn", "lang": "Norwegian Nynorsk"},
  {"abbr": "nb", "lang": "Norwegian Bokmål"},
  {"abbr": "no", "lang": "Norwegian"},
@@ -126,15 +126,15 @@
  {"abbr": "os", "lang": "Ossetian"},
  {"abbr": "pa", "lang": "Panjabi"},
  {"abbr": "pi", "lang": "Pali"},
- {"abbr": "pl", "lang": "Polish"},
- {"abbr": "pt", "lang": "Portuguese"},
- {"abbr": "pt_BR", "lang": "Brazilian Portuguese"},
+ {"abbr": "pl", "lang": "Polish", "translated_lang": "Polskie"},
+ {"abbr": "pt", "lang": "Portuguese", "translated_lang": "Português"},
+ {"abbr": "pt_BR", "lang": "Brazilian Portuguese", "translated_lang": "Portugues do Brasil"},
  {"abbr": "ps", "lang": "Pushto"},
  {"abbr": "qu", "lang": "Quechua"},
  {"abbr": "rm", "lang": "Romansh"},
  {"abbr": "ro", "lang": "Romanian"},
  {"abbr": "rn", "lang": "Rundi"},
- {"abbr": "ru", "lang": "Russian"},
+ {"abbr": "ru", "lang": "Russian", "translated_lang":  "русский"},
  {"abbr": "sg", "lang": "Sango"},
  {"abbr": "sa", "lang": "Sanskrit"},
  {"abbr": "si", "lang": "Sinhala"},
@@ -146,14 +146,14 @@
  {"abbr": "sd", "lang": "Sindhi"},
  {"abbr": "so", "lang": "Somali"},
  {"abbr": "st", "lang": "Southern Sotho"},
- {"abbr": "es", "lang": "Spanish"},
+ {"abbr": "es", "lang": "Spanish", "translated_lang": "Española"},
  {"abbr": "sq", "lang": "Albanian"},
  {"abbr": "sc", "lang": "Sardinian"},
  {"abbr": "sr", "lang": "Serbian"},
  {"abbr": "ss", "lang": "Swati"},
  {"abbr": "su", "lang": "Sundanese"},
  {"abbr": "sw", "lang": "Swahili (macrolanguage)"},
- {"abbr": "sv", "lang": "Swedish"},
+ {"abbr": "sv", "lang": "Swedish", "translated_lang":  "Svenska"},
  {"abbr": "ty", "lang": "Tahitian"},
  {"abbr": "ta", "lang": "Tamil"},
  {"abbr": "tt", "lang": "Tatar"},
@@ -166,11 +166,11 @@
  {"abbr": "tn", "lang": "Tswana"},
  {"abbr": "ts", "lang": "Tsonga"},
  {"abbr": "tk", "lang": "Turkmen"},
- {"abbr": "tr", "lang": "Turkish"},
+ {"abbr": "tr", "lang": "Turkish", "translated_lang" :  "Türk"},
  {"abbr": "tw", "lang": "Twi"},
  {"abbr": "ug", "lang": "Uighur"},
  {"abbr": "uk", "lang": "Ukrainian"},
- {"abbr": "ur", "lang": "Urdu"},
+ {"abbr": "ur", "lang": "Urdu", "translated_lang": "اردو"},
  {"abbr": "uz", "lang": "Uzbek"},
  {"abbr": "ve", "lang": "Venda"},
  {"abbr": "vi", "lang": "Vietnamese"},