master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
2 changed files with 2 additions and 0 deletions
Showing only changes of commit 076bee5e95 - Show all commits

View File

@ -18,6 +18,7 @@
<div class="cookies-banner-content py-3"> <div class="cookies-banner-content py-3">
<span class="cookies-warning-text pr-5"> <span class="cookies-warning-text pr-5">
<%= t("cookies.cookie_info") %> <%= t("cookies.cookie_info") %>
<%= t("cookies.policy", privacy_link: privpolicy_url).html_safe if privpolicy_url.present? %>
</span> </span>
<span class="cookies-warning-button d-inline-block"> <span class="cookies-warning-button d-inline-block">
<button id="cookies-agree-button" class="btn customBtn primary-regular"><%= t("cookies.cookie_button") %></button> <button id="cookies-agree-button" class="btn customBtn primary-regular"><%= t("cookies.cookie_button") %></button>

View File

@ -229,6 +229,7 @@ en:
cookies: cookies:
cookie_info: Cookies help us deliver our services. By using our services, you agree to our use of cookies. cookie_info: Cookies help us deliver our services. By using our services, you agree to our use of cookies.
cookie_button: I Agree cookie_button: I Agree
policy: For more infomation, see our <a href="%{privacy_link}"><u>privacy policy</u></a>.
copied: Copied copied: Copied
copy: Copy copy: Copy
date: date: