@schukai/monster 3.97.0 → 3.98.0

package/source/i18n/util.mjs

@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: AGPL-3.0
  */
 
-import {languages} from "./map/languages.mjs";
+import { languages } from "./map/languages.mjs";
 
 /**
  * Determines the user's preferred language based on browser settings and available language options.
@@ -23,117 +23,125 @@ import {languages} from "./map/languages.mjs";
  * @return {Object} An object containing information about the detected language, preferred language, and available languages.
  */
 export function detectUserLanguagePreference() {
-    const currentLang = document.documentElement.lang;
-
-    let preferredLanguages = [];
-
-    if (typeof navigator.language === "string" && navigator.language.length > 0) {
-        preferredLanguages = [navigator.language];
-    }
-
-    if (Array.isArray(navigator.languages) && navigator.languages.length > 0) {
-        preferredLanguages = navigator.languages;
-    }
-
-    // add to preferredLanguages all the base languages of the preferred languages
-    preferredLanguages = preferredLanguages.concat(preferredLanguages.map(lang => lang.split("-")[0]));
-
-
-    if (!currentLang && preferredLanguages.length === 0) {
-        return {
-            message: "No language information available.",
-        };
-    }
-
-    const linkTags = document.querySelectorAll("link[hreflang]");
-    if (linkTags.length === 0) {
-        return {
-            current: currentLang || null,
-            message: "No <link> tags with hreflang available.",
-        };
-    }
-
-    const availableLanguages = [...linkTags].map((link) => {
-        const fullLang = link.hreflang;
-        const baseLang = fullLang.split("-")[0];
-        let label = link.getAttribute('data-monster-label')
-        if (!label) {
-            label = languages?.[fullLang]
-            if (!label) {
-                label = languages?.[baseLang]
-            }
-        }
-
-        return {
-            fullLang,
-            baseLang,
-            label,
-            href: link.href,
-        };
-    });
-
-    // filter availableLanguages to only include languages that are in the preferredLanguages array
-    const offerableLanguages = availableLanguages.filter(lang => preferredLanguages.includes(lang.fullLang) || preferredLanguages.includes(lang.baseLang));
-
-    if (offerableLanguages.length === 0) {
-        return {
-            current: currentLang || null,
-            message: "No available languages match the user's preferences.",
-            available: availableLanguages.map((lang) => ({
-                ...lang,
-                weight: 1,
-            })),
-        };
-    }
-
-    // Helper function to determine the "weight" of a language match
-    function getWeight(langEntry) {
-        // Full match has priority 3
-        if (preferredLanguages.includes(langEntry.fullLang)) return 3;
-        // Base language match has priority 2
-        if (preferredLanguages.includes(langEntry.baseLang)) return 2;
-        // No match is priority 1
-        return 1;
-    }
-
-    // Sort the available languages by descending weight
-    offerableLanguages.sort((a, b) => getWeight(b) - getWeight(a));
-
-    // The best match is the first in the sorted list
-    const bestMatch = offerableLanguages[0];
-    const bestMatchWeight = getWeight(bestMatch);
-
-    const currentLabel = languages?.[currentLang] || currentLang
-
-    // If we found a language that matches user preferences (weight > 1)
-    if (bestMatchWeight > 0) {
-        return {
-            current: currentLang || null,
-            currentLabel: currentLabel,
-            preferred: {
-                full: bestMatch.fullLang,
-                base: bestMatch.baseLang,
-                label: bestMatch.label,
-                href : bestMatch.href,
-            },
-            available: availableLanguages.map((lang) => ({
-                ...lang,
-                weight: getWeight(lang),
-            })),
-            offerable: offerableLanguages.map((lang) => ({
-                ...lang,
-                weight: getWeight(lang),
-            })),
-        };
-    }
-
-    // If no language matched the user's preferences
-    return {
-        current: currentLang || null,
-        message: "None of the preferred languages are available.",
-        available: availableLanguages.map((lang) => ({
-            ...lang,
-            weight: getWeight(lang),
-        })),
-    };
+	const currentLang = document.documentElement.lang;
+
+	let preferredLanguages = [];
+
+	if (typeof navigator.language === "string" && navigator.language.length > 0) {
+		preferredLanguages = [navigator.language];
+	}
+
+	if (Array.isArray(navigator.languages) && navigator.languages.length > 0) {
+		preferredLanguages = navigator.languages;
+	}
+
+	// add to preferredLanguages all the base languages of the preferred languages
+	preferredLanguages = preferredLanguages.concat(
+		preferredLanguages.map((lang) => lang.split("-")[0]),
+	);
+
+	if (!currentLang && preferredLanguages.length === 0) {
+		return {
+			message: "No language information available.",
+		};
+	}
+
+	const linkTags = document.querySelectorAll("link[hreflang]");
+	if (linkTags.length === 0) {
+		return {
+			current: currentLang || null,
+			message: "No <link> tags with hreflang available.",
+		};
+	}
+
+	const availableLanguages = [...linkTags].map((link) => {
+		const fullLang = link.hreflang;
+		const baseLang = fullLang.split("-")[0];
+		let label = link.getAttribute("data-monster-label");
+		if (!label) {
+			label = link.getAttribute("title");
+			if (!label) {
+				label = languages?.[fullLang];
+				if (!label) {
+					label = languages?.[baseLang];
+				}
+			}
+		}
+
+		return {
+			fullLang,
+			baseLang,
+			label,
+			href: link.href,
+		};
+	});
+
+	// filter availableLanguages to only include languages that are in the preferredLanguages array
+	const offerableLanguages = availableLanguages.filter(
+		(lang) =>
+			preferredLanguages.includes(lang.fullLang) ||
+			preferredLanguages.includes(lang.baseLang),
+	);
+
+	if (offerableLanguages.length === 0) {
+		return {
+			current: currentLang || null,
+			message: "No available languages match the user's preferences.",
+			available: availableLanguages.map((lang) => ({
+				...lang,
+				weight: 1,
+			})),
+		};
+	}
+
+	// Helper function to determine the "weight" of a language match
+	function getWeight(langEntry) {
+		// Full match has priority 3
+		if (preferredLanguages.includes(langEntry.fullLang)) return 3;
+		// Base language match has priority 2
+		if (preferredLanguages.includes(langEntry.baseLang)) return 2;
+		// No match is priority 1
+		return 1;
+	}
+
+	// Sort the available languages by descending weight
+	offerableLanguages.sort((a, b) => getWeight(b) - getWeight(a));
+
+	// The best match is the first in the sorted list
+	const bestMatch = offerableLanguages[0];
+	const bestMatchWeight = getWeight(bestMatch);
+
+	const currentLabel = languages?.[currentLang] || currentLang;
+
+	// If we found a language that matches user preferences (weight > 1)
+	if (bestMatchWeight > 0) {
+		return {
+			current: currentLang || null,
+			currentLabel: currentLabel,
+			preferred: {
+				full: bestMatch.fullLang,
+				base: bestMatch.baseLang,
+				label: bestMatch.label,
+				href: bestMatch.href,
+			},
+			available: availableLanguages.map((lang) => ({
+				...lang,
+				weight: getWeight(lang),
+			})),
+			offerable: offerableLanguages.map((lang) => ({
+				...lang,
+				weight: getWeight(lang),
+			})),
+		};
+	}
+
+	// If no language matched the user's preferences
+	return {
+		current: currentLang || null,
+		message: "None of the preferred languages are available.",
+		available: availableLanguages.map((lang) => ({
+			...lang,
+			weight: getWeight(lang),
+		})),
+	};
 }

package/source/monster.mjs

@@ -91,6 +91,7 @@ export * from "./components/datatable/embedded-pagination.mjs";
 export * from "./components/datatable/status.mjs";
 export * from "./components/datatable/change-button.mjs";
 export * from "./components/datatable/constants.mjs";
+export * from "./components/accessibility/locale-picker.mjs";
 export * from "./components/state/log/entry.mjs";
 export * from "./components/state/state.mjs";
 export * from "./components/state/log.mjs";

package/source/types/version.mjs

@@ -156,7 +156,7 @@ function getMonsterVersion() {
 	}
 
 	/** don't touch, replaced by make with package.json version */
-	monsterVersion = new Version("3.96.2");
+	monsterVersion = new Version("3.97.1");
 
 	return monsterVersion;
 }

package/test/cases/monster.mjs

@@ -7,7 +7,7 @@ describe('Monster', function () {
         let monsterVersion
 
         /** don´t touch, replaced by make with package.json version */
-        monsterVersion = new Version("3.96.2")
+        monsterVersion = new Version("3.97.1")
 
         let m = getMonsterVersion();
 

package/test/web/import.js

@@ -113,4 +113,5 @@ import "../cases/i18n/locale.mjs";
 import "../cases/i18n/provider.mjs";
 import "../cases/i18n/providers/fetch.mjs";
 import "../cases/i18n/providers/embed.mjs";
+import "../cases/i18n/util.mjs";
 import "../cases/i18n/translations.mjs";

package/test/web/test.html

@@ -9,8 +9,8 @@
 </head>
 <body>
 <div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
-  <h1 style='margin-bottom: 0.1em;'>Monster 3.96.2</h1>
-  <div id="lastupdate" style='font-size:0.7em'>last update Fr 3. Jan 15:17:06 CET 2025</div>
+  <h1 style='margin-bottom: 0.1em;'>Monster 3.97.1</h1>
+  <div id="lastupdate" style='font-size:0.7em'>last update So 5. Jan 14:38:20 CET 2025</div>
 </div>
 <div id="mocha-errors"
      style="color: red;font-weight: bold;display: flex;align-items: center;justify-content: center;flex-direction: column;margin:20px;"></div>