7 files changed, 96 insertions, 31 deletions

diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c
index d47851f5..43e8ff97 100644
--- a/src/ui/certimportwidget.c
+++ b/src/ui/certimportwidget.c
@@ -47,8 +47,7 @@ struct Impl_CertImportWidget {
     iTlsCertificate *cert;
 };
 
-static const char *infoText_ = "Paste a PEM-encoded certificate and/or private key,\n"
-                               "or drop a .crt/.key file on the window.";
+static const char *infoText_ = "${dlg.certimport.help}";
 
 static iBool tryImport_CertImportWidget_(iCertImportWidget *d, const iBlock *data) {
     iBool ok = iFalse;
@@ -84,7 +83,7 @@ static iBool tryImport_CertImportWidget_(iCertImportWidget *d, const iBlock *dat
             setFrameColor_Widget(as_Widget(d->crtLabel), uiTextAction_ColorId);
         }
         else {
-            setTextCStr_LabelWidget(d->crtLabel, uiTextCaution_ColorEscape "No Certificate");
+            setTextCStr_LabelWidget(d->crtLabel, uiTextCaution_ColorEscape "${dlg.certimport.nocert}");
             setFrameColor_Widget(as_Widget(d->crtLabel), uiTextCaution_ColorId);
         }
         if (d->cert && hasPrivateKey_TlsCertificate(d->cert)) {
@@ -96,7 +95,7 @@ static iBool tryImport_CertImportWidget_(iCertImportWidget *d, const iBlock *dat
             setFrameColor_Widget(as_Widget(d->keyLabel), uiTextAction_ColorId);
         }
         else {
-            setTextCStr_LabelWidget(d->keyLabel, uiTextCaution_ColorEscape "No Private Key");
+            setTextCStr_LabelWidget(d->keyLabel, uiTextCaution_ColorEscape "${dlg.certimport.nokey}");
             setFrameColor_Widget(as_Widget(d->keyLabel), uiTextCaution_ColorId);
         }
     }
@@ -118,9 +117,10 @@ void init_CertImportWidget(iCertImportWidget *d) {
                             overflowScrollable_WidgetFlag,
                         iTrue);
     }
-    addChildFlags_Widget(w,
-                         iClob(new_LabelWidget(uiHeading_ColorEscape "IMPORT IDENTITY", NULL)),
-                         frameless_WidgetFlag);
+    addChildFlags_Widget(
+        w,
+        iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.certimport}", NULL)),
+        frameless_WidgetFlag);
     d->info = addChildFlags_Widget(w, iClob(new_LabelWidget(infoText_, NULL)), frameless_WidgetFlag);
     addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
     d->crtLabel = new_LabelWidget("", NULL); {
@@ -141,9 +141,9 @@ void init_CertImportWidget(iCertImportWidget *d) {
             page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
         iWidget *values = addChildFlags_Widget(
             page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
-        addChild_Widget(headings, iClob(makeHeading_Widget("Notes:")));
+        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.certimport.notes}")));
         addChild_Widget(values, iClob(d->notes = new_InputWidget(0)));
-        setHint_InputWidget(d->notes, "description");
+        setHint_InputWidget(d->notes, "${hint.certimport.description}");
         as_Widget(d->notes)->rect.size.x = gap_UI * 70;
     }
     addChild_Widget(w, iClob(page));
@@ -153,9 +153,11 @@ void init_CertImportWidget(iCertImportWidget *d) {
     /* Buttons. */
     addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
     iWidget *buttons = makeDialogButtons_Widget(
-        (iMenuItem[]){
-            { "${cancel}", 0, 0, NULL },
-            { uiTextAction_ColorEscape "Import", SDLK_RETURN, KMOD_PRIMARY, "certimport.accept" } },
+        (iMenuItem[]){ { "${cancel}", 0, 0, NULL },
+                       { uiTextAction_ColorEscape "${dlg.certimport.import}",
+                         SDLK_RETURN,
+                         KMOD_PRIMARY,
+                         "certimport.accept" } },
         2);
     addChild_Widget(w, iClob(buttons));
     arrange_Widget(w);
@@ -182,7 +184,7 @@ void setPageContent_CertImportWidget(iCertImportWidget *d, const iBlock *content
     }
     else {
         setTextCStr_LabelWidget(
-            d->info, format_CStr("No certificate/key found on the current page.\n%s", infoText_));
+            d->info, format_CStr("${dlg.certimport.notfound.page}\n%s", infoText_));
     }
     arrange_Widget(as_Widget(d));
 }
@@ -198,8 +200,8 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even
         const int mods = keyMods_Sym(ev->key.keysym.mod);
         if (key == SDLK_v && mods == KMOD_PRIMARY) {
             if (!tryImportFromClipboard_CertImportWidget_(d)) {
-                makeMessage_Widget(uiTextCaution_ColorEscape "PASTED FROM CLIPBOARD",
-                                   "No certificate or private key was found.");
+                makeMessage_Widget(uiTextCaution_ColorEscape "${heading.certimport.pasted}",
+                                   "${dlg.certimport.notfound}");
             }
             postRefresh_App();
             return iTrue;
@@ -232,8 +234,8 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even
                 }
             }
             else {
-                makeMessage_Widget(uiTextCaution_ColorEscape "DROPPED FILE",
-                                   "No certificate or private key was found.");
+                makeMessage_Widget(uiTextCaution_ColorEscape "${heading.certimport.dropped}",
+                                   "${dlg.certimport.notfound}");
             }
         }
         iRelease(f);
diff --git a/src/ui/command.c b/src/ui/command.c
index 44e66121..c5ca164e 100644
--- a/src/ui/command.c
+++ b/src/ui/command.c
@@ -96,7 +96,7 @@ iString *suffix_Command(const char *cmd, const char *label) {
 }
 
 const iString *string_Command(const char *cmd, const char *label) {
-    return collect_String(newRange_String(range_Command(cmd, label)));
+    return collectNewRange_String(range_Command(cmd, label));
 }
 
 iRangecc range_Command(const char *cmd, const char *label) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 05b83b3d..52359732 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -83,6 +83,7 @@ struct Impl_InputWidget {
     iArray          text;    /* iChar[] */
     iArray          oldText; /* iChar[] */
     iString         hint;
+    iString         srcHint;
     int             leftPadding;
     int             rightPadding;
     size_t          cursor;
@@ -136,6 +137,7 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     init_Array(&d->text, sizeof(iChar));
     init_Array(&d->oldText, sizeof(iChar));
     init_String(&d->hint);
+    init_String(&d->srcHint);
     init_Array(&d->undoStack, sizeof(iInputUndo));
     d->font         = uiInput_FontId | alwaysVariableFlag_FontId;
     d->leftPadding  = 0;
@@ -164,6 +166,7 @@ void deinit_InputWidget(iInputWidget *d) {
     if (d->timer) {
         SDL_RemoveTimer(d->timer);
     }
+    deinit_String(&d->srcHint);
     deinit_String(&d->hint);
     deinit_Array(&d->oldText);
     deinit_Array(&d->text);
@@ -251,8 +254,10 @@ void setMaxLen_InputWidget(iInputWidget *d, size_t maxLen) {
 }
 
 void setHint_InputWidget(iInputWidget *d, const char *hintText) {
-    setCStr_String(&d->hint, hintText);
-    translate_Lang(&d->hint); /* TODO: Keep original for retranslations. */
+    /* Keep original for retranslations. */
+    setCStr_String(&d->srcHint, hintText);
+    set_String(&d->hint, &d->srcHint);
+    translate_Lang(&d->hint);
 }
 
 void setContentPadding_InputWidget(iInputWidget *d, int left, int right) {
@@ -665,6 +670,11 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         begin_InputWidget(d);
         return iFalse;
     }
+    else if (isCommand_UserEvent(ev, "lang.changed")) {
+        set_String(&d->hint, &d->srcHint);
+        translate_Lang(&d->hint);
+        return iFalse;
+    }
     else if (isCommand_Widget(w, ev, "focus.lost")) {
         end_InputWidget(d, iTrue);
         return iFalse;
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 2a1eb06a..8089445b 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -85,6 +85,10 @@ static iBool processEvent_LabelWidget_(iLabelWidget *d, const SDL_Event *ev) {
     if (isMetricsChange_UserEvent(ev)) {
         updateSize_LabelWidget(d);
     }
+    else if (isCommand_UserEvent(ev, "lang.changed")) {
+        setText_LabelWidget(d, &d->srcLabel);
+        return iFalse;
+    }
     else if (isCommand_UserEvent(ev, "bindings.changed")) {
         /* Update the key used to trigger this label. */
         updateKey_LabelWidget_(d);
@@ -474,6 +478,11 @@ const iString *text_LabelWidget(const iLabelWidget *d) {
     return &d->label;
 }
 
+const iString *sourceText_LabelWidget(const iLabelWidget *d) {
+    if (!d) return collectNew_String();
+    return &d->srcLabel;
+}
+
 const iString *command_LabelWidget(const iLabelWidget *d) {
     return &d->command;
 }
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 3e3c76fb..f4c4658c 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -45,6 +45,7 @@ void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not r
 iInt2           defaultSize_LabelWidget (const iLabelWidget *);
 int             font_LabelWidget        (const iLabelWidget *);
 const iString * text_LabelWidget        (const iLabelWidget *);
+const iString * sourceText_LabelWidget  (const iLabelWidget *); /* untranslated */
 const iString * command_LabelWidget     (const iLabelWidget *);
 iChar           icon_LabelWidget        (const iLabelWidget *);
 
diff --git a/src/ui/util.c b/src/ui/util.c
index 94690bc6..8c0b0138 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1679,14 +1679,13 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
 
 void setToggle_Widget(iWidget *d, iBool active) {
     if (d) {
-        const char *YES = cstr_Lang("toggle.yes");
-        const char *NO  = cstr_Lang("toggle.no");
         setFlags_Widget(d, selected_WidgetFlag, active);
         iLabelWidget *label = (iLabelWidget *) d;
-        if (!cmp_String(text_LabelWidget(label), YES) ||
-            !cmp_String(text_LabelWidget(label), NO)) {
-            updateText_LabelWidget((iLabelWidget *) d,
-                                   collectNewCStr_String(isSelected_Widget(d) ? YES : NO));
+        if (!cmp_String(text_LabelWidget(label), cstr_Lang("toggle.yes")) ||
+            !cmp_String(text_LabelWidget(label), cstr_Lang("toggle.no"))) {
+            updateText_LabelWidget(
+                (iLabelWidget *) d,
+                collectNewCStr_String(isSelected_Widget(d) ? "${toggle.yes}" : "${toggle.no}"));
         }
         else {
             refresh_Widget(d);
@@ -1707,9 +1706,10 @@ static iBool toggleHandler_(iWidget *d, const char *cmd) {
 }
 
 iWidget *makeToggle_Widget(const char *id) {
-    iWidget *toggle = as_Widget(new_LabelWidget("YES", "toggle")); /* "YES" for sizing */
+    iWidget *toggle = as_Widget(new_LabelWidget("${toggle.yes}", "toggle")); /* "YES" for sizing */
     setId_Widget(toggle, id);
-    updateTextCStr_LabelWidget((iLabelWidget *) toggle, "NO"); /* actual initial value */
+    updateTextCStr_LabelWidget((iLabelWidget *) toggle, "${toggle.no}"); /* actual initial value */
+    setFlags_Widget(toggle, fixedWidth_WidgetFlag, iTrue);
     setCommandHandler_Widget(toggle, toggleHandler_);
     return toggle;
 }
@@ -1787,6 +1787,11 @@ static void addFontButtons_(iWidget *parent, const char *id) {
     delete_Array(items);
 }
 
+static int cmp_MenuItem_(const void *e1, const void *e2) {
+    const iMenuItem *a = e1, *b = e2;
+    return iCmpStr(a->label, b->label);
+}
+
 iWidget *makePreferences_Widget(void) {
     iWidget *dlg = makeSheet_Widget("prefs");
     addChildFlags_Widget(dlg,
@@ -1820,6 +1825,36 @@ iWidget *makePreferences_Widget(void) {
     }
     /* Window. */ {
         appendTwoColumnPage_(tabs, "${heading.prefs.interface}", '2', &headings, &values);
+        /* UI languages. */ {
+            iArray *uiLangs = collectNew_Array(sizeof(iMenuItem));
+            const iMenuItem langItems[] = {
+                { "${lang.en}", 0, 0, "uilang id:en" },
+                { "${lang.fi}", 0, 0, "uilang id:fi" },
+            };
+            pushBackN_Array(uiLangs, langItems, iElemCount(langItems));
+            sort_Array(uiLangs, cmp_MenuItem_);
+            /* TODO: Add an arrange flag for resizing parent to widest child. */
+            int widest = 0;
+            size_t widestPos = iInvalidPos;
+            iConstForEach(Array, i, uiLangs) {
+                const int width =
+                    advance_Text(uiLabel_FontId,
+                                 translateCStr_Lang(((const iMenuItem *) i.value)->label))
+                        .x;
+                if (widestPos == iInvalidPos || width > widest) {
+                    widest = width;
+                    widestPos = index_ArrayConstIterator(&i);
+                }
+            }
+            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.uilang}")));
+            setId_Widget(addChildFlags_Widget(values,
+                                              iClob(makeMenuButton_LabelWidget(
+                                                  value_Array(uiLangs, widestPos, iMenuItem).label,
+                                                  data_Array(uiLangs),
+                                                  size_Array(uiLangs))),
+                                              0),
+                         "prefs.uilang");
+        }
 #if defined (iPlatformApple) || defined (iPlatformMSys)
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.ostheme}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.ostheme")));
@@ -1898,11 +1933,15 @@ iWidget *makePreferences_Widget(void) {
             addFontButtons_(values, "font");
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.mono}")));
             iWidget *mono = new_Widget();
-            /* TODO: Needs labels! */
+            iWidget *tog;
             setTextCStr_LabelWidget(
-                addChild_Widget(mono, iClob(makeToggle_Widget("prefs.mono.gemini"))), "${prefs.mono.gemini}");
+                addChild_Widget(mono, tog = iClob(makeToggle_Widget("prefs.mono.gemini"))), "${prefs.mono.gemini}");
+            setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
+            updateSize_LabelWidget((iLabelWidget *) tog);
             setTextCStr_LabelWidget(
-                addChild_Widget(mono, iClob(makeToggle_Widget("prefs.mono.gopher"))), "${prefs.mono.gopher}");
+                addChild_Widget(mono, tog = iClob(makeToggle_Widget("prefs.mono.gopher"))), "${prefs.mono.gopher}");
+            setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
+            updateSize_LabelWidget((iLabelWidget *) tog);
             addChildFlags_Widget(values, iClob(mono), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         }
         makeTwoColumnHeading_("${heading.prefs.paragraph}", headings, values);
diff --git a/src/ui/window.c b/src/ui/window.c
index 6949e245..97500b22 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1820,6 +1820,10 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
             if (isMetricsChange_UserEvent(&event)) {
                 updateMetrics_Window_(d);
             }
+            if (isCommand_UserEvent(&event, "lang.changed")) {
+                invalidate_Window_(d);
+                arrange_Widget(d->root);
+            }
             if (oldHover != hover_Widget()) {
                 postRefresh_App();
             }