diff --git a/Gemfile b/Gemfile index 2e4281ba..be47f8e0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,13 @@ source "https://rubygems.org" # Install github-pages gem (https://jekyllrb.com/docs/github-pages/) -gem "github-pages", group: :jekyll_plugins +gem "jekyll", group: :jekyll_plugins # Plugins group :jekyll_plugins do # example: gem "jekyll-feed", "~> 0.6" gem 'jekyll-multiple-languages-plugin' + gem 'jekyll-sitemap' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/_config.yml b/_config.yml index 73caaac5..5bd7b3cb 100644 --- a/_config.yml +++ b/_config.yml @@ -6,6 +6,7 @@ sass: plugins: - jekyll-sitemap - jekyll-multiple-languages-plugin +plugins_dir: "./_plugins" sitemap: file: "/sitemap.xml" include: [".well-known"] diff --git a/_i18n/en.yml b/_i18n/en.yml index ebee1398..25f6511e 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -3,6 +3,7 @@ lang: polish: "Polski" global: further_reading: "Further Reading" + new: "New" header: lead: "You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance." search: "Try search.privacytools.io, a Privacy-Respecting Search Engine" @@ -113,3 +114,16 @@ contact: editorial_team: "Editorial Team" up_to_date: "It's very important to us to stay up-to-date on the latest changes in the privacy space." reach_out: "If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out." + start_discussion: "Start a discussion in our Discourse Forum" + open_an_issue: "Open an issue or pull request on GitHub" + reddit_suggestion: "Suggest something new on Reddit" + transparency: "For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms." + on_matrix: "We're now on Matrix! Join us at" + on_matrix2: "to chat with us and other members about this site and privacy in general" + register_matrix: "If you need a Matrix account, you can sign up with our own homeserver" + using: "using" + or_matrix_client: "or any Matrix client!" + abuse1: "We take the operation of our various services very seriously." + abuse2: "Report only abuse here:" + searx_issues: "Searx Issues" + website_issues: "Website Issues" diff --git a/_layouts/page.html b/_layouts/page.html index 4a137c66..985abb5c 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -3,8 +3,8 @@ layout: default ---
-

{{ page.title }}

- {% if page.description and page.hidedesc != true %}

{{ page.description }}

{% endif %} +

{{ page.title | flatify }}

+ {% if page.description and page.hidedesc != true %}

{{ page.description | flatify }}

{% endif %}
{{ content }} diff --git a/_plugins/expand_nested_variable_filter.rb b/_plugins/expand_nested_variable_filter.rb new file mode 100644 index 00000000..c0762dc2 --- /dev/null +++ b/_plugins/expand_nested_variable_filter.rb @@ -0,0 +1,9 @@ +module Jekyll + module ExpandNestedVariableFilter + def flatify(input) + Liquid::Template.parse(input).render(@context) + end + end +end + +Liquid::Template.register_filter(Jekyll::ExpandNestedVariableFilter) diff --git a/contact.md b/contact.md index c4d02145..10a985e5 100644 --- a/contact.md +++ b/contact.md @@ -1,27 +1,27 @@ --- layout: page permalink: /contact/ -title: "Contact Us" -description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues." +title: "{% t contact.title %}" +description: "{% t contact.description %}" --- -## Editorial Team +## {% t contact.editorial_team %} -It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out. +{% t contact.up_to_date %} {% t contact.reach_out %} -[ Start a discussion in our Discourse Forum](https://forum.privacytools.io/) +[ {% t contact.start_discussion }](https://forum.privacytools.io/) -[ Open an issue or pull request on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues) +[ {% t contact.open_an_issue %}](https://github.com/privacytoolsIO/privacytools.io/issues) -[ Suggest something new on reddit](https://www.reddit.com/r/privacytoolsIO/) +[ {% t contact.reddit_suggestion %}](https://www.reddit.com/r/privacytoolsIO/) -For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms. +{% t contact.transparency %} - New: We're now on Matrix! Join us at `#general:privacytools.io` to chat with us and other members about this site and privacy in general. If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client! If you prefer XMPP, you're welcome to [use the Matrix.org XMPP bridge to join the discussion](https://conversations.im/j/%23general%23privacytools.io@bridge.xmpp.matrix.org). + {% t global.new %}: {% t contact.on_matrix %} `#general:privacytools.io` {% t contact.on_matrix2 %}. {% t contact.register_matrix %} (`https://chat.privacytools.io`) {% t contact.using %} [riot.privacytools.io](https://riot.privacytools.io/) {% t contact.or_matrix_client %} ## Abuse -We take the operation of our various [services](/services/) very seriously. Report only abuse here: abuse at privacytools dot io. +{% t contact.abuse1 %} {% t contact.abuse2 %} abuse at privacytools dot io.
@@ -30,8 +30,8 @@ We take the operation of our various [services](/services/) very seriously. Repo GitHub Issues