akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(portal): emit valid BCP 47 html lang attribute (#14680)

Browse Source 
Locales are stored with underscores (e.g. pt_BR), but the HTML lang
attribute requires hyphens (pt-BR). Convert via a helper in the public
portal layouts.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
This commit is contained in:
Pranav
2026-06-15 14:34:52 -07:00
committed by GitHub
co-authored by Claude Opus 4.8 Sivin Varghese
parent 1713cabdf2
commit dda25c0b51
4 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/portal_helper.rb
+4
View File
@@ -41,6 +41,10 @@ module PortalHelper
language_map[locale] || locale
end
def html_lang_attribute(locale)
locale.to_s.tr('_', '-')
end
def theme_query_string(theme)
theme.present? && theme != 'system' ? "?theme=#{theme}" : ''
end
app/views/layouts/portal.html+documentation.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="<%= I18n.locale %>">
<html lang="<%= html_lang_attribute(I18n.locale) %>">
<head>
<%= render 'layouts/portal_head' %>
</head>
app/views/layouts/portal.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="<%= I18n.locale %>">
<html lang="<%= html_lang_attribute(I18n.locale) %>">
<head>
<%= render 'layouts/portal_head' %>
</head>
spec/helpers/portal_helper_spec.rb
+22
View File
@@ -1,6 +1,28 @@
require 'rails_helper'
describe PortalHelper do
describe '#html_lang_attribute' do
it 'returns the locale unchanged when it has no region suffix' do
expect(helper.html_lang_attribute('en')).to eq('en')
expect(helper.html_lang_attribute(:fr)).to eq('fr')
end
it 'converts underscores to hyphens for BCP 47 compliance' do
expect(helper.html_lang_attribute('pt_BR')).to eq('pt-BR')
expect(helper.html_lang_attribute(:zh_CN)).to eq('zh-CN')
expect(helper.html_lang_attribute('zh_TW')).to eq('zh-TW')
end
it 'produces a valid BCP 47 lang attribute for every language shown in the UI' do
bcp47 = /\A[a-z]{2,3}(-[A-Z]{2})?\z/
LANGUAGES_CONFIG.each_value do |lang|
locale = lang[:iso_639_1_code]
expect(helper.html_lang_attribute(locale)).to match(bcp47)
end
end
end
describe '#generate_portal_bg_color' do
context 'when theme is dark' do
it 'returns the correct color mix with black' do