From 00e6d0524f527d09ffa3d1c040111968b0861171 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 22 Apr 2021 20:41:58 +0200 Subject: [PATCH 1/4] Accessibility: add language to `lang` attr on `html` tag I only use the first subtag of the language string given by `get_language()`, because `get_language()` returns an all-lowercase string, and I don't know if it'll be considered valid by browsers. --- bookwyrm/templates/layout.html | 2 +- bookwyrm/templatetags/bookwyrm_tags.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 4ce7a7f8c..84482cdfc 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -1,7 +1,7 @@ {% load bookwyrm_tags %} {% load i18n %} - + {% block title %}BookWyrm{% endblock %} | {{ site.name }} diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 69e762cef..f1bd025d3 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -1,7 +1,7 @@ """ template filters """ from uuid import uuid4 -from django import template +from django import template, utils from django.db.models import Avg from bookwyrm import models, views @@ -217,3 +217,10 @@ def active_read_through(book, user): def comparison_bool(str1, str2): """ idk why I need to write a tag for this, it reutrns a bool """ return str1 == str2 + + +@register.simple_tag(takes_context=False) +def get_lang(): + """ get current language, strip to the first two letters """ + language = utils.translation.get_language() + return language[0:language.find('-')] From ebf20de10e9dfab157d7924e6a249539dccc3830 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 22 Apr 2021 20:45:16 +0200 Subject: [PATCH 2/4] linter linter go away --- bookwyrm/templatetags/bookwyrm_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index f1bd025d3..30bb1d3fa 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -223,4 +223,4 @@ def comparison_bool(str1, str2): def get_lang(): """ get current language, strip to the first two letters """ language = utils.translation.get_language() - return language[0:language.find('-')] + return language[0 : language.find('-')] From 15241e38074ff7f6f66c55abbadcabd801ad80a7 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 22 Apr 2021 20:48:06 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=E2=80=A6=E2=80=A6=E2=80=A6=20come=20back?= =?UTF-8?q?=20another=20day?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookwyrm/templatetags/bookwyrm_tags.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 30bb1d3fa..08713bee8 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -223,4 +223,5 @@ def comparison_bool(str1, str2): def get_lang(): """ get current language, strip to the first two letters """ language = utils.translation.get_language() - return language[0 : language.find('-')] + return language[0 : language.find("-")] + From 6c89eb1b650a0c1c8a9c70ddccf08f898d0ad2d6 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 22 Apr 2021 20:48:25 +0200 Subject: [PATCH 4/4] Update bookwyrm_tags.py --- bookwyrm/templatetags/bookwyrm_tags.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 08713bee8..649a0dfa1 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -224,4 +224,3 @@ def get_lang(): """ get current language, strip to the first two letters """ language = utils.translation.get_language() return language[0 : language.find("-")] -