mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-05 08:23:28 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
* 3.2.x:
  [ticket/14974] make cookie notice configurable via language files
This commit is contained in:
Tristan Darricau 2017-03-19 18:11:43 +01:00
commit 9c49aebfe9
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/common.php
View File

@ -181,6 +181,7 @@ $lang = array_merge($lang, array(
'COOKIE_CONSENT_INFO' => 'Learn more',
'COOKIE_CONSENT_MSG' => 'This website uses cookies to ensure you get the best experience on our website.',
'COOKIE_CONSENT_OK' => 'Got it!',
'COOKIE_CONSENT_HREF' => 'http://cookiesandyou.com',
'COOKIES_DELETED' => 'All board cookies successfully deleted.',
'CURRENT_TIME' => 'It is currently %s',

3
phpBB/styles/prosilver/template/overall_footer.html
View File

@ -84,7 +84,8 @@
"content": {
"message": "{LA_COOKIE_CONSENT_MSG}",
"dismiss": "{LA_COOKIE_CONSENT_OK}",
"link": "{LA_COOKIE_CONSENT_INFO}"
"link": "{LA_COOKIE_CONSENT_INFO}",
"href": "{LA_COOKIE_CONSENT_HREF}"
}
})});
</script>