From ed76ae04c2b7e0221f1f3ca6d9ddf2d2bc04a3d2 Mon Sep 17 00:00:00 2001 From: awesomerobot Date: Tue, 13 May 2025 14:21:24 -0400 Subject: [PATCH 1/2] UX: normalize locale --- javascripts/discourse/components/custom-header-links.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/javascripts/discourse/components/custom-header-links.js b/javascripts/discourse/components/custom-header-links.js index e7c1639..b289858 100644 --- a/javascripts/discourse/components/custom-header-links.js +++ b/javascripts/discourse/components/custom-header-links.js @@ -1,6 +1,9 @@ import Component from "@glimmer/component"; import { dasherize } from "@ember/string"; +function normalizeLocale(locale) { + return locale?.toLowerCase().replace(/-/g, "_"); +} export default class CustomHeaderLinks extends Component { get shouldShow() { return settings.custom_header_links?.length > 0; @@ -16,7 +19,9 @@ export default class CustomHeaderLinks extends Component { const locale = link.locale; const device = link.view; - if (!linkText || (locale && document.documentElement.lang !== locale)) { + const currentLocale = normalizeLocale(document.documentElement.lang); + + if (!linkText || (locale && normalizeLocale(locale) !== currentLocale)) { return result; } From 8d3125fea8606f84d962b0a2e5ad27fb5ec56b60 Mon Sep 17 00:00:00 2001 From: awesomerobot Date: Tue, 13 May 2025 14:24:42 -0400 Subject: [PATCH 2/2] cover more cases --- javascripts/discourse/components/custom-header-links.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascripts/discourse/components/custom-header-links.js b/javascripts/discourse/components/custom-header-links.js index b289858..678c6a9 100644 --- a/javascripts/discourse/components/custom-header-links.js +++ b/javascripts/discourse/components/custom-header-links.js @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { dasherize } from "@ember/string"; function normalizeLocale(locale) { - return locale?.toLowerCase().replace(/-/g, "_"); + return locale?.trim().toLowerCase().replace(/[-_]/g, "_"); } export default class CustomHeaderLinks extends Component { get shouldShow() {