diff --git a/src/steps/render.js b/src/steps/render.js
index 2532f589..4a612b79 100644
--- a/src/steps/render.js
+++ b/src/steps/render.js
@@ -17,6 +17,14 @@ import rehypeParse from 'rehype-parse';
import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
import { contentSecurityPolicyOnAST } from './csp.js';
+const LANG_REGEX = /^[a-z]{2}(?:[-_][a-z]{2})?$/i;
+
+function formatLang(lang) {
+ return lang
+ .replace('_', '-')
+ .toLowerCase();
+}
+
function appendElement($parent, $el) {
if ($el) {
$parent.children.push($el);
@@ -76,8 +84,19 @@ export default async function render(state, req, res) {
continue;
}
if (name.toLowerCase() === 'html-lang') {
- if (/^[a-z]{2}([-_]{1}[a-z]{2})?$/i.test(value)) {
- htmlLang = value;
+ if (LANG_REGEX.test(value)) {
+ htmlLang = formatLang(value);
+ }
+ // eslint-disable-next-line no-continue
+ continue;
+ }
+ if (name.toLowerCase().startsWith('hreflang-')) {
+ const lang = name.substring(9);
+ if (LANG_REGEX.test(lang)) {
+ appendElement(
+ $head,
+ createElement('link', 'rel', 'alternate', 'hreflang', formatLang(lang), 'href', value),
+ );
}
// eslint-disable-next-line no-continue
continue;
diff --git a/test/fixtures/content/page-metadata-hreflang-invalid.html b/test/fixtures/content/page-metadata-hreflang-invalid.html
new file mode 100644
index 00000000..71fe8436
--- /dev/null
+++ b/test/fixtures/content/page-metadata-hreflang-invalid.html
@@ -0,0 +1,27 @@
+
+
+ Home | Helix Project Boilerplate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
HTML lang test
+
This is great.
+
+
HTML lang test
+
This is great.
+