yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Correct HTML lang attribute in source. closes #6534

Browse Source
This commit is contained in:
Tom Moor
2024-02-16 12:44:17 -05:00
parent 69eb7b9db4
commit 2b0a8d1f7c
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/routes/app.ts
View File

@@ -6,6 +6,7 @@ import escape from "lodash/escape";
import { Sequelize } from "sequelize"; import { Sequelize } from "sequelize";
import isUUID from "validator/lib/isUUID"; import isUUID from "validator/lib/isUUID";
import { IntegrationType, TeamPreference } from "@shared/types"; import { IntegrationType, TeamPreference } from "@shared/types";
import { unicodeCLDRtoISO639 } from "@shared/utils/date";
import documentLoader from "@server/commands/documentLoader"; import documentLoader from "@server/commands/documentLoader";
import env from "@server/env"; import env from "@server/env";
import { Integration } from "@server/models"; import { Integration } from "@server/models";
@@ -91,6 +92,7 @@ export const renderApp = async (
ctx.body = page ctx.body = page
.toString() .toString()
.replace(/\{env\}/g, environment) .replace(/\{env\}/g, environment)
.replace(/\{lang\}/g, unicodeCLDRtoISO639(env.DEFAULT_LANGUAGE))
.replace(/\{title\}/g, escape(title)) .replace(/\{title\}/g, escape(title))
.replace(/\{description\}/g, escape(description)) .replace(/\{description\}/g, escape(description))
.replace(/\{canonical-url\}/g, canonical) .replace(/\{canonical-url\}/g, canonical)

2
server/static/index.html
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="{lang}">
<head> <head>
<title>{title}</title> <title>{title}</title>
<meta name="theme-color" content="#FFF" /> <meta name="theme-color" content="#FFF" />

10
shared/utils/date.ts
View File

@@ -106,6 +106,16 @@ export function unicodeBCP47toCLDR(locale: string) {
return locale.replace("-", "_").replace("und", "root"); return locale.replace("-", "_").replace("und", "root");
} }
/**
* Converts a locale string from Unicode CLDR format to ISO 639 format.
*
* @param locale The locale string to convert
* @returns The converted locale string
*/
export function unicodeCLDRtoISO639(locale: string) {
return locale.split("_")[0];
}
/** /**
* Returns the current date as a string formatted depending on current locale. * Returns the current date as a string formatted depending on current locale.
* *