From cb974e47476284d967483f7478e3dcb5a2d974d4 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 9 Feb 2019 14:29:35 +0100 Subject: [PATCH] Accessibility: specify the HTML lang attribute The lang is based on the user defined one. If the language is automatic, no language will be specified. Fixes #1216 --- application/render/PageBuilder.php | 2 ++ index.php | 1 - tpl/default/404.html | 2 +- tpl/default/addlink.html | 2 +- tpl/default/changepassword.html | 2 +- tpl/default/changetag.html | 2 +- tpl/default/configure.html | 2 +- tpl/default/daily.html | 2 +- tpl/default/editlink.html | 2 +- tpl/default/export.html | 2 +- tpl/default/import.html | 2 +- tpl/default/install.html | 2 +- tpl/default/linklist.html | 2 +- tpl/default/loginform.html | 2 +- tpl/default/picwall.html | 2 +- tpl/default/pluginsadmin.html | 2 +- tpl/default/tag.cloud.html | 2 +- tpl/default/tag.list.html | 2 +- tpl/default/thumbnails.html | 2 +- tpl/default/tools.html | 2 +- 20 files changed, 20 insertions(+), 19 deletions(-) diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php index 0569b67..3f86fc2 100644 --- a/application/render/PageBuilder.php +++ b/application/render/PageBuilder.php @@ -123,6 +123,8 @@ class PageBuilder $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); $this->tpl->assign('token', $this->token); + $this->tpl->assign('language', $this->conf->get('translation.language')); + if ($this->linkDB !== null) { $this->tpl->assign('tags', $this->linkDB->linksCountPerTag()); } diff --git a/index.php b/index.php index 633ab89..50a871e 100644 --- a/index.php +++ b/index.php @@ -1074,7 +1074,6 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager, $PAGE->assign('api_enabled', $conf->get('api.enabled', true)); $PAGE->assign('api_secret', $conf->get('api.secret')); $PAGE->assign('languages', Languages::getAvailableLanguages()); - $PAGE->assign('language', $conf->get('translation.language')); $PAGE->assign('gd_enabled', extension_loaded('gd')); $PAGE->assign('thumbnails_mode', $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)); $PAGE->assign('pagetitle', t('Configure') .' - '. $conf->get('general.title', 'Shaarli')); diff --git a/tpl/default/404.html b/tpl/default/404.html index fd337ca..10a9458 100644 --- a/tpl/default/404.html +++ b/tpl/default/404.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html index 55864a0..b4b4a0e 100644 --- a/tpl/default/addlink.html +++ b/tpl/default/addlink.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html index 2d15c92..3867e3c 100644 --- a/tpl/default/changepassword.html +++ b/tpl/default/changepassword.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html index 6606c4f..0da6a5e 100644 --- a/tpl/default/changetag.html +++ b/tpl/default/changetag.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/configure.html b/tpl/default/configure.html index 42e3223..7a87c05 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 2c40947..359ecbd 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index d8c5715..df14535 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/export.html b/tpl/default/export.html index af1d6e3..99c01b1 100644 --- a/tpl/default/export.html +++ b/tpl/default/export.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/import.html b/tpl/default/import.html index bdc9086..20f854d 100644 --- a/tpl/default/import.html +++ b/tpl/default/import.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/install.html b/tpl/default/install.html index 6199b33..f0e7040 100644 --- a/tpl/default/install.html +++ b/tpl/default/install.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index ed78f40..d7005c2 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index 3cdab65..bfc5481 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 4c32548..5a95924 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index 8204197..4bfaa93 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html index 9e52158..bedf3f8 100644 --- a/tpl/default/tag.cloud.html +++ b/tpl/default/tag.cloud.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index bcddcd5..41eab24 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/thumbnails.html b/tpl/default/thumbnails.html index a8cf904..f193979 100644 --- a/tpl/default/thumbnails.html +++ b/tpl/default/thumbnails.html @@ -1,5 +1,5 @@ - + {include="includes"} diff --git a/tpl/default/tools.html b/tpl/default/tools.html index c9ce1ea..20d0c89 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -1,5 +1,5 @@ - + {include="includes"}