aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2019-03-02 10:54:30 +0100
committerGitHub <noreply@github.com>2019-03-02 10:54:30 +0100
commit90e048594a2981ac510d024a4f0ae2d5f188a176 (patch)
tree6a785107e741a70d88f0786103e53d0825e788c5
parentcc69aad4a903dc603f47cfa87aeb1865b03c8950 (diff)
parentcb974e47476284d967483f7478e3dcb5a2d974d4 (diff)
downloadShaarli-90e048594a2981ac510d024a4f0ae2d5f188a176.tar.gz
Shaarli-90e048594a2981ac510d024a4f0ae2d5f188a176.tar.zst
Shaarli-90e048594a2981ac510d024a4f0ae2d5f188a176.zip
Merge pull request #1272 from ArthurHoaro/feature/html-lang
Accessibility: specify the HTML lang attribute
Diffstat
-rw-r--r--application/render/PageBuilder.php2
-rw-r--r--index.php1
-rw-r--r--tpl/default/404.html2
-rw-r--r--tpl/default/addlink.html2
-rw-r--r--tpl/default/changepassword.html2
-rw-r--r--tpl/default/changetag.html2
-rw-r--r--tpl/default/configure.html2
-rw-r--r--tpl/default/daily.html2
-rw-r--r--tpl/default/editlink.html2
-rw-r--r--tpl/default/export.html2
-rw-r--r--tpl/default/import.html2
-rw-r--r--tpl/default/install.html2
-rw-r--r--tpl/default/linklist.html2
-rw-r--r--tpl/default/loginform.html2
-rw-r--r--tpl/default/picwall.html2
-rw-r--r--tpl/default/pluginsadmin.html2
-rw-r--r--tpl/default/tag.cloud.html2
-rw-r--r--tpl/default/tag.list.html2
-rw-r--r--tpl/default/thumbnails.html2
-rw-r--r--tpl/default/tools.html2
20 files changed, 20 insertions, 19 deletions
diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php
index 0569b67f..3f86fc26 100644
--- a/application/render/PageBuilder.php
+++ b/application/render/PageBuilder.php
@@ -123,6 +123,8 @@ class PageBuilder
123 $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); 123 $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false));
124 $this->tpl->assign('token', $this->token); 124 $this->tpl->assign('token', $this->token);
125 125
126 $this->tpl->assign('language', $this->conf->get('translation.language'));
127
126 if ($this->linkDB !== null) { 128 if ($this->linkDB !== null) {
127 $this->tpl->assign('tags', $this->linkDB->linksCountPerTag()); 129 $this->tpl->assign('tags', $this->linkDB->linksCountPerTag());
128 } 130 }
diff --git a/index.php b/index.php
index a43063b0..a96c9cfd 100644
--- a/index.php
+++ b/index.php
@@ -1064,7 +1064,6 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
1064 $PAGE->assign('api_enabled', $conf->get('api.enabled', true)); 1064 $PAGE->assign('api_enabled', $conf->get('api.enabled', true));
1065 $PAGE->assign('api_secret', $conf->get('api.secret')); 1065 $PAGE->assign('api_secret', $conf->get('api.secret'));
1066 $PAGE->assign('languages', Languages::getAvailableLanguages()); 1066 $PAGE->assign('languages', Languages::getAvailableLanguages());
1067 $PAGE->assign('language', $conf->get('translation.language'));
1068 $PAGE->assign('gd_enabled', extension_loaded('gd')); 1067 $PAGE->assign('gd_enabled', extension_loaded('gd'));
1069 $PAGE->assign('thumbnails_mode', $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)); 1068 $PAGE->assign('thumbnails_mode', $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE));
1070 $PAGE->assign('pagetitle', t('Configure') .' - '. $conf->get('general.title', 'Shaarli')); 1069 $PAGE->assign('pagetitle', t('Configure') .' - '. $conf->get('general.title', 'Shaarli'));
diff --git a/tpl/default/404.html b/tpl/default/404.html
index fd337cad..10a9458a 100644
--- a/tpl/default/404.html
+++ b/tpl/default/404.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html
index 55864a02..b4b4a0ec 100644
--- a/tpl/default/addlink.html
+++ b/tpl/default/addlink.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html
index 2d15c92a..3867e3ca 100644
--- a/tpl/default/changepassword.html
+++ b/tpl/default/changepassword.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html
index 6606c4fa..0da6a5eb 100644
--- a/tpl/default/changetag.html
+++ b/tpl/default/changetag.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 42e32230..7a87c05d 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/daily.html b/tpl/default/daily.html
index 2c409478..359ecbd0 100644
--- a/tpl/default/daily.html
+++ b/tpl/default/daily.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index d8c57155..df14535d 100644
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/export.html b/tpl/default/export.html
index af1d6e33..99c01b11 100644
--- a/tpl/default/export.html
+++ b/tpl/default/export.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/import.html b/tpl/default/import.html
index bdc9086e..20f854d1 100644
--- a/tpl/default/import.html
+++ b/tpl/default/import.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/install.html b/tpl/default/install.html
index 6199b33d..f0e7040e 100644
--- a/tpl/default/install.html
+++ b/tpl/default/install.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index ed78f40a..d7005c21 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html
index 3cdab65a..bfc54815 100644
--- a/tpl/default/loginform.html
+++ b/tpl/default/loginform.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index 4c325487..5a959244 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html
index 82041972..4bfaa934 100644
--- a/tpl/default/pluginsadmin.html
+++ b/tpl/default/pluginsadmin.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html
index 9e52158d..bedf3f8c 100644
--- a/tpl/default/tag.cloud.html
+++ b/tpl/default/tag.cloud.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html
index bcddcd56..41eab246 100644
--- a/tpl/default/tag.list.html
+++ b/tpl/default/tag.list.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/thumbnails.html b/tpl/default/thumbnails.html
index a8cf904e..f1939798 100644
--- a/tpl/default/thumbnails.html
+++ b/tpl/default/thumbnails.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index c9ce1eaf..20d0c893 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -1,5 +1,5 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
3<head> 3<head>
4 {include="includes"} 4 {include="includes"}
5</head> 5</head>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 06:47:35 +0000