From 2cae3083f540256da02f65d8ddc5976694a30be8 Mon Sep 17 00:00:00 2001 From: James Ray Date: Fri, 1 Apr 2022 15:50:47 -0700 Subject: [PATCH] Add missing `lang` attributes to `` elements. Fix #8212 (#8220) Co-authored-by: Thibaud Colas --- CHANGELOG.txt | 1 + CONTRIBUTORS.rst | 1 + docs/releases/3.0.md | 1 + .../admin/templates/wagtailadmin/notifications/base.html | 6 ++++-- wagtail/project_template/project_name/templates/500.html | 5 ++++- wagtail/templates/wagtailcore/login.html | 5 ++++- wagtail/templates/wagtailcore/page.html | 5 ++++- wagtail/templates/wagtailcore/password_required.html | 5 ++++- wagtail/test/testapp/templates/tests/base.html | 6 ++++-- 9 files changed, 27 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d6b4bc6198..b54e2a2947 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -51,6 +51,7 @@ Changelog * Fix: Remove redundant `role="main"` attributes on `
` elements causing HTML validation issues (Luis Espinoza) * Fix: Allow bulk publishing of pages without revisions (Andy Chosak) * Fix: Stop skipping heading levels in Wagtail welcome page (Jesse Menn) + * Fix: Add missing `lang` attributes to `` elements (James Ray) 2.16.2 (xx.xx.xxxx) - IN DEVELOPMENT diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 3a040fb71e..ddf6a6b07d 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -578,6 +578,7 @@ Contributors * Luis Espinoza * Hitansh Shah * Saurabh kumar +* James Ray Translators =========== diff --git a/docs/releases/3.0.md b/docs/releases/3.0.md index 17acd19771..ede3da38d0 100644 --- a/docs/releases/3.0.md +++ b/docs/releases/3.0.md @@ -85,6 +85,7 @@ class LandingPage(Page): * Remove redundant `role="main"` attributes on `
` elements causing HTML validation issues (Luis Espinoza) * Allow bulk publishing of pages without revisions (Andy Chosak) * Stop skipping heading levels in Wagtail welcome page (Jesse Menn) + * Add missing `lang` attributes to `` elements (James Ray) ## Upgrade considerations diff --git a/wagtail/admin/templates/wagtailadmin/notifications/base.html b/wagtail/admin/templates/wagtailadmin/notifications/base.html index 32c6d42704..4142db1759 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/base.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/base.html @@ -1,6 +1,8 @@ -{% load i18n wagtailadmin_tags %} +{% load wagtailadmin_tags i18n %} +{% get_current_language as LANGUAGE_CODE %} +{% get_current_language_bidi as LANGUAGE_BIDI %} - + diff --git a/wagtail/project_template/project_name/templates/500.html b/wagtail/project_template/project_name/templates/500.html index e35391be4b..42eb4db22d 100644 --- a/wagtail/project_template/project_name/templates/500.html +++ b/wagtail/project_template/project_name/templates/500.html @@ -1,5 +1,8 @@ +{% load wagtailadmin_tags i18n %} +{% get_current_language as LANGUAGE_CODE %} +{% get_current_language_bidi as LANGUAGE_BIDI %} - + Internal server error diff --git a/wagtail/templates/wagtailcore/login.html b/wagtail/templates/wagtailcore/login.html index 5bbc0add94..b52ffe0137 100644 --- a/wagtail/templates/wagtailcore/login.html +++ b/wagtail/templates/wagtailcore/login.html @@ -1,6 +1,9 @@ {% load i18n %} +{% load wagtailadmin_tags i18n %} +{% get_current_language as LANGUAGE_CODE %} +{% get_current_language_bidi as LANGUAGE_BIDI %} - + {% trans "Log in" %} diff --git a/wagtail/templates/wagtailcore/page.html b/wagtail/templates/wagtailcore/page.html index 636ff5851c..9b571b6fa9 100644 --- a/wagtail/templates/wagtailcore/page.html +++ b/wagtail/templates/wagtailcore/page.html @@ -1,5 +1,8 @@ +{% load wagtailadmin_tags i18n %} +{% get_current_language as LANGUAGE_CODE %} +{% get_current_language_bidi as LANGUAGE_BIDI %} - + {{ self.title }} diff --git a/wagtail/templates/wagtailcore/password_required.html b/wagtail/templates/wagtailcore/password_required.html index a10d8ab59b..0d2dbdfdeb 100644 --- a/wagtail/templates/wagtailcore/password_required.html +++ b/wagtail/templates/wagtailcore/password_required.html @@ -1,6 +1,9 @@ {% load i18n %} +{% load wagtailadmin_tags i18n %} +{% get_current_language as LANGUAGE_CODE %} +{% get_current_language_bidi as LANGUAGE_BIDI %} - + {% trans "Password required" %} diff --git a/wagtail/test/testapp/templates/tests/base.html b/wagtail/test/testapp/templates/tests/base.html index 636b5c5883..29a99cac7a 100644 --- a/wagtail/test/testapp/templates/tests/base.html +++ b/wagtail/test/testapp/templates/tests/base.html @@ -1,7 +1,9 @@ {% load wagtailuserbar %} - +{% load wagtailadmin_tags i18n %} +{% get_current_language as LANGUAGE_CODE %} +{% get_current_language_bidi as LANGUAGE_BIDI %} - + {% block html_title %}{{ self.title }}{% endblock %}