@rr0/cms 0.3.76 → 0.3.78

package/dist/RR0Context.d.ts

@@ -29,7 +29,12 @@ export declare class RR0ContextImpl extends SsgContextImpl {
     readonly images: Set<string>;
     protected readonly fileMap: Map<string, FileContents>;
     place: PlaceContext;
+    /**
+     * The language of a passage that differs from its page's (<blockquote lang="en"> in a French page).
+     */
+    protected localeOverride?: string;
     constructor(locale: string, time: TimeContext, config: FileWriteConfig, people?: any, currentFile?: FileContents | undefined, _messages?: RR0Messages, cms?: CMSContext);
+    get locale(): string;
     get messages(): RR0Messages;
     read(filePath: string): FileContents;
     clone(locale?: string): RR0ContextImpl;

package/dist/RR0Context.js

@@ -13,6 +13,10 @@ export class RR0ContextImpl extends SsgContextImpl {
         this.fileMap = new Map();
         this.place = new PlaceContext(locale, this.messages.context.place);
     }
+    get locale() {
+        var _a;
+        return (_a = this.localeOverride) !== null && _a !== void 0 ? _a : super.locale;
+    }
     get messages() {
         let messages = this._messages;
         if (!messages) {
@@ -43,7 +47,10 @@ export class RR0ContextImpl extends SsgContextImpl {
     }
     clone(locale = this.locale) {
         var _a;
-        return new RR0ContextImpl(locale, this.time.clone(), this.config, (_a = this.people) === null || _a === void 0 ? void 0 : _a.clone(), this._file, this.messages, this.cms);
+        const sameLocale = locale === this.locale;
+        const clone = new RR0ContextImpl(locale, this.time.clone(), this.config, (_a = this.people) === null || _a === void 0 ? void 0 : _a.clone(), this._file, sameLocale ? this._messages : undefined, this.cms);
+        clone.localeOverride = sameLocale ? this.localeOverride : locale;
+        return clone;
     }
     toString() {
         var _a;

package/dist/lang/LanguageReplaceCommand.js

@@ -30,7 +30,9 @@ export class LanguageReplaceCommand extends DomReplaceCommand {
                         }
                     }
                     else {
-                        pageLang = "fr";
+                        // A file without variant is French, unless it declares otherwise (an English document not translated yet)
+                        const declared = inputFile.document.querySelector("meta[http-equiv='content-language' i]");
+                        pageLang = (declared === null || declared === void 0 ? void 0 : declared.content.trim().substring(0, 2).toLowerCase()) || "fr";
                     }
                     inputFile.document.documentElement.lang = inputFile.lang.lang = pageLang;
                     const langVariants = variants.length == 1 && variants[0] == "" ? [pageLang == "fr" ? "en" : "fr"] : variants;

package/dist/lang/LanguageReplaceCommand.test.js

@@ -8,6 +8,12 @@ describe("LanguageReplaceCommand", () => {
         await command.execute(context);
         expect(context.file.contents).toBe(`<html lang="fr"><head><meta name="generator" content="ssg-api"></head><body><span id="alternate"><a href="/${cmsTestUtil.filePath(cmsTestUtil.time.filePath("1/9/6/8/CondonReport/index.html"))}">English version</a></span></body></html>`);
     });
+    test("declared language of a file without variant", async () => {
+        const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", `<meta http-equiv="content-language" content="en"><span id="alternate"/>`);
+        await new LanguageReplaceCommand().execute(context);
+        expect(context.file.lang.lang).toBe("en");
+        expect(context.file.document.documentElement.lang).toBe("en");
+    });
     test("add english translation", async () => {
         const context = cmsTestUtil.time.newHtmlContext("0/6/4/0/ChronicaMinor/index_fr.html", `<span id="alternate"/>`);
         const command = new LanguageReplaceCommand();

package/dist/time/html/TimeElementFactory.js

@@ -53,12 +53,13 @@ export class TimeElementFactory {
         return replacement;
     }
     createStarting(fromContext, previousContext, options) {
+        options = { ...options, relativeWords: false }; // Not "à partir de l'année suivante"
         const { result, replacement } = this.renderer.renderContent(fromContext, previousContext, options);
         let startingReplacement;
         startingReplacement = fromContext.file.document.createElement("span");
         startingReplacement.className = "time-interval";
         const approximate = !fromContext.time.getDayOfMonth();
-        startingReplacement.innerHTML = fromContext.messages.context.time.starting(approximate) + " " + result.outerHTML;
+        startingReplacement.textContent = fromContext.messages.context.time.starting(approximate);
         result.append(startingReplacement, replacement);
         return result;
     }

package/dist/time/html/TimeReplacer.d.ts

@@ -20,7 +20,11 @@ export declare class TimeReplacer implements DomReplacement<HtmlRR0Context, HTML
      * @return The text that precedes an element in its sentence.
      */
     static precedingText(el: Element): string;
-    replacement(context: HtmlRR0Context, origEl: HTMLTimeElement): Promise<HTMLElement>;
+    /**
+     * @return The language of the passage holding an element, if it differs from its page's.
+     */
+    static passageLang(context: HtmlRR0Context, el: Element): string | undefined;
+    replacement(pageContext: HtmlRR0Context, origEl: HTMLTimeElement): Promise<HTMLElement>;
     /**
      * Renders a range of durations ("P10M/12M") as "from 10 to 12 minutes".
      */

package/dist/time/html/TimeReplacer.js

@@ -24,12 +24,23 @@ export class TimeReplacer {
         }
         return (_b = (_a = node.previousSibling) === null || _a === void 0 ? void 0 : _a.textContent) !== null && _b !== void 0 ? _b : "";
     }
-    async replacement(context, origEl) {
+    /**
+     * @return The language of the passage holding an element, if it differs from its page's.
+     */
+    static passageLang(context, el) {
+        var _a, _b;
+        const lang = (_b = (_a = el.closest("[lang]")) === null || _a === void 0 ? void 0 : _a.getAttribute("lang")) === null || _b === void 0 ? void 0 : _b.trim().substring(0, 2).toLowerCase();
+        return lang && lang !== context.locale.substring(0, 2) ? lang : undefined;
+    }
+    async replacement(pageContext, origEl) {
         let replacement;
         if (origEl.dateTime || origEl.dataset.format === "none") { // Already done, or not to be interpreted
             replacement = origEl;
         }
         else {
+            // A time in a passage of another language ("<blockquote lang='en'>") is rendered in that language
+            const passageLang = TimeReplacer.passageLang(pageContext, origEl);
+            const context = passageLang ? pageContext.clone(passageLang) : pageContext;
             const previousContext = origEl.dataset.context === "none" ? undefined : context.clone();
             const timeStr = origEl.textContent;
             const { prefix, value, suffix } = this.completer.split(timeStr);
@@ -72,6 +83,9 @@ export class TimeReplacer {
                 wrapper.append(prefix, replacement, suffix);
                 replacement = wrapper;
             }
+            if (context !== pageContext) {
+                pageContext.time = context.time; // The next times of the page follow this one
+            }
             context.debug("\tReplacing time", origEl.outerHTML, "with", ObjectUtils.asSet(replacement).outerHTML);
         }
         return replacement;

package/dist/time/html/TimeReplacer.test.js

@@ -236,6 +236,15 @@ describe("TimeReplacer", async () => {
         test("but not without one", async () => {
             expect(await renderAfter("fr", "<time>2005</time>. Puis, <time>2006</time>")).toBe("l'année suivante");
         });
+        test("in the language of its passage", async () => {
+            expect(await renderAfter("fr", "<time>2005</time>. <q lang=\"en\">in <time>2006</time></q>")).toBe("2006");
+            expect(await renderAfter("fr", "<time>2005</time>. <q lang=\"en\">Then <time>2006</time></q>")).toBe("the year after");
+            expect(await renderAfter("fr", "<q lang=\"en\"><time>2006</time></q>. <time>2007</time>")).toBe("l'année suivante");
+        });
+        test("including the one of an open interval", async () => {
+            expect(await renderAfter("fr", "<time>2005</time>. <time>2006/</time>")).toBe("à partir de 2006");
+            expect(await renderAfter("en", "<time>2005</time>. <time>2006/</time>")).toBe("starting 2006");
+        });
     });
     test("avoids linking to current file", async () => {
         const context = cmsTestUtil.time.newHtmlContext("1/9/9/0/08/index.html", "");

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.76",
+  "version": "0.3.78",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",