8 files changed, 101 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2166acc5..19cc6653 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,6 +73,7 @@ set (EMBED_RESOURCES
     res/fonts/SourceSansPro-Regular.ttf
     res/fonts/SourceSansPro-Bold.ttf
     res/fonts/Symbola.ttf
+    res/lang/en.bin
     res/shadow.png
 )
 if ((UNIX AND NOT APPLE) OR MSYS)
diff --git a/po/compile.py b/po/compile.py
new file mode 100755
index 00000000..6e565733
--- /dev/null
+++ b/po/compile.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+# Parses all the .po files and generates binary language strings to be loaded 
+# at runtime via embedded data.
+
+import os
+
+ESCAPES = {
+    '\\': '\\',
+    '"': '"',
+    'n': '\n',
+    'r': '\r',
+    't': '\t'
+}
+
+
+def unquote(string):
+    txt = string.strip()
+    if txt[0] != '"' or txt[-1] != '"':
+        raise Exception("invalid quoted string: " + string)
+    txt = txt[1:-1]
+    out = ''
+    is_escape = False
+    for c in txt:
+        if is_escape:
+            out += ESCAPES[c]
+            is_escape = False
+            continue
+        if c == '\\':
+            is_escape = True
+        else:
+            out += c
+    return out        
+        
+        
+messages = []
+for src in os.listdir('.'):
+    if not src.endswith('.po'):
+        continue
+    msg_id, msg_str = None, None
+    for line in open(src, 'rt', encoding='utf-8').readlines():
+        line = line.strip()
+        if line.startswith('msgid'):
+            msg_id = unquote(line[6:])
+        elif line.startswith('msgstr'):
+            msg_str = unquote(line[7:])        
+            messages.append((msg_id, msg_str))
+    # Make a binary blob with strings sorted by ID.
+    compiled = bytes()
+    for msg in sorted(messages):
+        compiled += msg[0].encode('utf-8') + bytes([0])
+        compiled += msg[1].encode('utf-8') + bytes([0])
+    #print(compiled)
+    open(f'../res/lang/{src[:-3]}.bin', 'wb').write(compiled)
+    
+    
diff --git a/res/about/lagrange.gmi b/res/about/lagrange.gmi
index c043d26b..7544c26d 100644
--- a/res/about/lagrange.gmi
+++ b/res/about/lagrange.gmi
@@ -10,6 +10,6 @@ o888ooooood8 `Y888""8o `8oooooo.  d888b    `Y888""8o o888o o888o `8oooooo.  `Y8b
                        "Y88888P'                                 "Y88888P'
 ```
 # ${about.tagline}
-## ${version} ${APP_VERSION}
+## ${about.version} ${APP_VERSION}
 => https://skyjake.fi/@jk by @jk@skyjake.fi
 ${about.powered}
diff --git a/res/lang/en.bin b/res/lang/en.bin
new file mode 100644
index 00000000..d02a2f3d
--- /dev/null
+++ b/res/lang/en.bin
diff --git a/src/app.c b/src/app.c
index 4789c62b..95345bda 100644
--- a/src/app.c
+++ b/src/app.c
@@ -507,7 +507,6 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
 
 static void init_App_(iApp *d, int argc, char **argv) {
     init_CommandLine(&d->args, argc, argv);
-    init_Lang();
     /* Where was the app started from? We ask SDL first because the command line alone is
        not a reliable source of this information, particularly when it comes to different
        operating systems. */ {
@@ -533,6 +532,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
         }
     }
 #endif
+    init_Lang();
     /* Configure the valid command line options. */ {
         defineValues_CommandLine(&d->args, "close-tab", 0);
         defineValues_CommandLine(&d->args, "echo;E", 0);
diff --git a/src/lang.c b/src/lang.c
index 3e99c09c..d0120798 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -31,15 +31,16 @@ static void clear_Lang_(iLang *d) {
 
 static void load_Lang_(iLang *d, const char *id) {
     /* Load compiled language strings from an embedded blob. */
-    const iBlock *data = NULL; // &blobLangEn_Embedded;
+    iUnused(id);
+    const iBlock *data = &blobEn_Embedded;
     iMsgStr msg;
     for (const char *ptr = constBegin_Block(data); ptr != constEnd_Block(data); ptr++) {
         msg.id = ptr;
         while (*++ptr) {}
         msg.str = ++ptr;
         while (*++ptr) {}
-        /* Allocate the string. */
-        insert_SortedArray(d->messages, &msg);
+        /* Allocate the string. The data has already been sorted. */
+        pushBack_Array(&d->messages->values, &msg);
     }
 }
 
@@ -68,8 +69,8 @@ const char *cstr_Lang(const char *msgId) {
     if (locate_SortedArray(d->messages, &key, &pos)) {
         return ((const iMsgStr *) at_SortedArray(d->messages, pos))->str;
     }
-    //iAssert(iFalse);
-    fprintf(stderr, "[Lang] missing: %s\n", msgId);
+    fprintf(stderr, "[Lang] missing: %s\n", msgId); fflush(stderr);
+    iAssert(iFalse);
     return msgId;
 }
 
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index ea70977c..c3bc4392 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -40,6 +40,7 @@ iLocalDef iInt2 padding_(int64_t flags) {
 
 struct Impl_LabelWidget {
     iWidget widget;
+    iString srcLabel;
     iString label;
     int     font;
     int     key;
@@ -357,12 +358,40 @@ void updateSize_LabelWidget(iLabelWidget *d) {
     }
 }
 
+static void replaceVariables_LabelWidget_(iLabelWidget *d) {
+    for (const char *label = cstr_String(&d->label); *label; ) {
+        iRangecc id;
+        id.start = strstr(label, "${");
+        if (!id.start) {
+            break;
+        }
+        id.start += 2;
+        id.end = strchr(id.start, '}');
+        iAssert(id.end != NULL);
+        /* TODO: Add a lookup that doesn't allocate anything; Lang can handle it. */
+        const size_t len = size_Range(&id);
+        char *key = malloc(len + 1);
+        memcpy(key, id.start, len);
+        key[len] = 0;
+        const char *text = cstr_Lang(key);
+        const size_t textLen = strlen(text);
+        free(key);
+        /* Replace it. */
+        size_t startPos = id.start - cstr_String(&d->label) - 2;
+        remove_Block(&d->label.chars, startPos, len + 3);
+        insertData_Block(&d->label.chars, startPos, text, textLen);
+        label = cstr_String(&d->label) + startPos + textLen;
+    }
+}
+
 void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     init_Widget(&d->widget);
     d->font = uiLabel_FontId;
     d->forceFg = none_ColorId;
     d->icon = 0;
-    initCStr_String(&d->label, label);
+    initCStr_String(&d->srcLabel, label);
+    initCopy_String(&d->label, &d->srcLabel);
+    replaceVariables_LabelWidget_(d);
     if (cmd) {
         initCStr_String(&d->command, cmd);
     }
@@ -381,6 +410,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
 
 void deinit_LabelWidget(iLabelWidget *d) {
     deinit_String(&d->label);
+    deinit_String(&d->srcLabel);
     deinit_String(&d->command);
 }
 
@@ -407,11 +437,15 @@ void setAlignVisually_LabelWidget(iLabelWidget *d, iBool alignVisual) {
 
 void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
     set_String(&d->label, text);
+    set_String(&d->srcLabel, text);
+    replaceVariables_LabelWidget_(d);
     refresh_Widget(&d->widget);
 }
 
 void updateTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
     setCStr_String(&d->label, text);
+    set_String(&d->srcLabel, &d->label);
+    replaceVariables_LabelWidget_(d);
     refresh_Widget(&d->widget);
 }
 
diff --git a/src/ui/window.c b/src/ui/window.c
index b8b2853e..2d1deb72 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -188,8 +188,8 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
 #if !defined (iPlatformAppleMobile)
 /* TODO: Submenus wouldn't hurt here. */
 static const iMenuItem navMenuItems_[] = {
-    { add_Icon " ${menu.nav.newtab}", 't', KMOD_PRIMARY, "tabs.new" },
-    { "${menu.nav.openlocation}", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
+    { add_Icon " ${menu.newtab}", 't', KMOD_PRIMARY, "tabs.new" },
+    { "${menu.openlocation}", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
     { "---", 0, 0, NULL },
     { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" },
     { "${menu.copy.source}", SDLK_c, KMOD_PRIMARY, "copy" },