From 6197186db8824bf95b2f0b9412b473c759bba90f Mon Sep 17 00:00:00 2001
From: Jaakko Keränen <jaakko.keranen@iki.fi>
Date: Thu, 25 Mar 2021 14:05:32 +0200
Subject: Preferences: Revised language selection dropdown

Visible IDs since the language names are also localized.
---
 po/en.po        |   3 +++
 res/lang/en.bin | Bin 15487 -> 15521 bytes
 src/ui/util.c   |  14 +++++++-------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/po/en.po b/po/en.po
index c580d059..d8c13619 100644
--- a/po/en.po
+++ b/po/en.po
@@ -663,6 +663,9 @@ msgstr "Arabic"
 msgid "lang.zh"
 msgstr "Chinese"
 
+msgid "lang.zh.hans"
+msgstr "Chinese (Simplified)"
+
 msgid "lang.en"
 msgstr "English"
 
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 427ce70b..6d3df947 100644
Binary files a/res/lang/en.bin and b/res/lang/en.bin differ
diff --git a/src/ui/util.c b/src/ui/util.c
index 61f09924..51696287 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1828,14 +1828,14 @@ iWidget *makePreferences_Widget(void) {
         /* UI languages. */ {
             iArray *uiLangs = collectNew_Array(sizeof(iMenuItem));
             const iMenuItem langItems[] = {
-                { "${lang.en} (en)", 0, 0, "uilang id:en" },
-                { "${lang.fi} (fi)", 0, 0, "uilang id:fi" },
-                { "${lang.ru} (ru)", 0, 0, "uilang id:ru" },
-                { "${lang.de} (de)", 0, 0, "uilang id:de" },
-                { "${lang.zh_Hans} (zh_Hans)", 0, 0, "uilang id:zh_Hans" },
+                { "${lang.de} - " uiTextAction_ColorEscape "de", 0, 0, "uilang id:de" },
+                { "${lang.en} - " uiTextAction_ColorEscape "en", 0, 0, "uilang id:en" },
+                { "${lang.fi} - " uiTextAction_ColorEscape "fi", 0, 0, "uilang id:fi" },
+                { "${lang.ru} - " uiTextAction_ColorEscape "ru", 0, 0, "uilang id:ru" },
+                { "${lang.zh.hans} - " uiTextAction_ColorEscape "zh_Hans", 0, 0, "uilang id:zh_Hans" },
             };
             pushBackN_Array(uiLangs, langItems, iElemCount(langItems));
-            sort_Array(uiLangs, cmp_MenuItem_);
+            //sort_Array(uiLangs, cmp_MenuItem_);
             /* TODO: Add an arrange flag for resizing parent to widest child. */
             int widest = 0;
             size_t widestPos = iInvalidPos;
@@ -1855,7 +1855,7 @@ iWidget *makePreferences_Widget(void) {
                                                   value_Array(uiLangs, widestPos, iMenuItem).label,
                                                   data_Array(uiLangs),
                                                   size_Array(uiLangs))),
-                                              0),
+                                              alignLeft_WidgetFlag),
                          "prefs.uilang");
         }
 #if defined (iPlatformApple) || defined (iPlatformMSys)
-- 
cgit v1.2.3