t() in a store, and a key no table has filled like a message

A store's t() and setLocale() compiled to bare calls the page could not
find; they go through WF.i18n as a page's do.

When no table had a key, the runtime returned the key without filling
its placeholders. Under i18n.literals that is the words as written, so a
string like "{n} missing" showed its braces in the default locale. The
key now has its placeholders filled as a message does, which is what the
build-time resolver already did.

Author: monzeromer-dev

src/codegen/js.rs

@@ -1773,6 +1773,9 @@ impl JsCodegen {
                 // call, but `parseInt` is a plain function).
                 if self.is_own_member(name, store_states) {
                     format!("store.{}({})", name, args_str.join(", "))
+                } else if (name == "t" || name == "setLocale") && self.has_i18n() {
+                    // A store's words, translated as a page's are.
+                    format!("WF.i18n.{}({})", name, args_str.join(", "))
                 } else if matches!(
                     name.as_str(),
                     // The same set a page reaches: a store's action is where

src/runtime/modules/i18n.js

@@ -32,8 +32,9 @@
         if (text === undefined) text = lookup(key + ".other");
       }
       if (text === undefined) text = lookup(key);
-      // Fallback to key itself
-      if (text === undefined) return key;
+      // No table has it: the key itself — under `i18n.literals`, the words
+      // as written — its placeholders filled as a message's are.
+      if (text === undefined) text = key;
       // Interpolate {placeholder} tokens
       if (params && text.includes("{")) {
         for (const [k, v] of Object.entries(params)) {

tests/build_api.rs

@@ -299,12 +299,12 @@ fn a_project_translated_by_its_own_words() {
     std::fs::write(dir.join("src/translations/en.json"), "{}\n").unwrap();
     std::fs::write(
         dir.join("src/translations/ar.json"),
-        "{ \"Problems\": \"المشاكل\", \"{n} missing\": \"{n} مفقودة\" }\n",
+        "{ \"Problems\": \"المشاكل\", \"{n} missing\": \"{n} مفقودة\", \"Ln {line}\": \"سطر {line}\" }\n",
     )
     .unwrap();
     std::fs::write(
         dir.join("src/pages/Home.wf"),
-        "page Home(path: \"/\", title: \"Home\", description: \"Words.\") {\n    state n = 3\n    Heading(\"Problems\").h1\n    Text(\"{n} missing\")\n    Icon(\"warning\")\n}\n",
+        "store Ed {\n    state line = 1\n    derived caretText = \"Ln {line}\"\n}\npage Home(path: \"/\", title: \"Home\", description: \"Words.\") {\n    use Ed\n    state n = 3\n    Heading(\"Problems\").h1\n    Text(\"{n} missing\")\n    Text(Ed.caretText)\n    Icon(\"warning\")\n}\n",
     )
     .unwrap();
     let vfs = OverlayVfs::over_disk();
@@ -346,6 +346,11 @@ fn a_project_translated_by_its_own_words() {
         "the keys are asked for"
     );
     assert!(js.contains("المشاكل"), "the table is in the build");
+    assert!(
+        js.contains("WF.i18n.t(\"Ln {line}\""),
+        "a store's words go through the table too"
+    );
+    assert!(!js.contains(" t(\""), "no bare t()");
     // The table counts them as used, and what the other locale is missing.
     let t = webfluent::i18n::table::table_via(&vfs, &dir)
         .unwrap()

tests/js/i18n.test.mjs

@@ -62,3 +62,12 @@ test("a locale with a region is written in its language's direction", () => {
   i18n.setLocale("ckb");
   assert.equal(i18n.dir(), "rtl");
 });
+
+test("a key no table has is shown as written, its placeholders filled — a project's words under i18n.literals", () => {
+  const WF = load("");
+  const i18n = WF.locales("en", { en: {}, ar: { "{n} missing": "{n} مفقودة" } });
+  assert.equal(i18n.t("{n} missing", { n: 3 }), "3 missing");
+  i18n.setLocale("ar");
+  assert.equal(i18n.t("{n} missing", { n: 3 }), "3 مفقودة");
+  assert.equal(i18n.t("{a} and {b}", { a: "x", b: "y" }), "x and y");
+});