From ee63e200033ca59fa44a52def843e83c4e7bff24 Mon Sep 17 00:00:00 2001 From: Jonah Date: Mon, 5 Aug 2019 22:42:14 -0500 Subject: [PATCH 01/34] Install jekyll-multiple-languages-plugin https://github.com/kurtsson/jekyll-multiple-languages-plugin --- .gitignore | 1 - Gemfile | 1 + _config.yml | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index af408d27d..a6ce8bd91 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ _site/ -Gemfile Gemfile.lock .sass-cache/ .DS_Store diff --git a/Gemfile b/Gemfile index 70f8d9540..2c096aa15 100644 --- a/Gemfile +++ b/Gemfile @@ -14,3 +14,4 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.0" if Gem.win_platform? +gem 'jekyll-multiple-languages-plugin' diff --git a/_config.yml b/_config.yml index 355e9fe60..73caaac51 100644 --- a/_config.yml +++ b/_config.yml @@ -5,6 +5,8 @@ sass: style: compressed plugins: - jekyll-sitemap + - jekyll-multiple-languages-plugin sitemap: file: "/sitemap.xml" include: [".well-known"] +languages: ["en", "pl"] From 065c632a2eb29cd860a6a9c944438913f56f4176 Mon Sep 17 00:00:00 2001 From: Jonah Date: Mon, 5 Aug 2019 22:56:21 -0500 Subject: [PATCH 02/34] Correct installation --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 2c096aa15..2e4281ba6 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ gem "github-pages", group: :jekyll_plugins # Plugins group :jekyll_plugins do # example: gem "jekyll-feed", "~> 0.6" + gem 'jekyll-multiple-languages-plugin' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem @@ -13,5 +14,3 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.0" if Gem.win_platform? - -gem 'jekyll-multiple-languages-plugin' From df38bc4da6d97e24e34b9d204cf30d532f052ad6 Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 00:01:41 -0500 Subject: [PATCH 03/34] Add index strings to en.yml --- _i18n/en.yml | 98 +++++++++++++++++++++++ _i18n/pl.yml | 3 + _includes/sections/header.html | 6 +- _includes/sections/participate.html | 25 +++--- _includes/sections/privacy-resources.html | 55 +++++++------ _includes/sections/quotes.html | 6 +- _includes/sections/resources.html | 41 ++++++---- 7 files changed, 177 insertions(+), 57 deletions(-) create mode 100644 _i18n/en.yml create mode 100644 _i18n/pl.yml diff --git a/_i18n/en.yml b/_i18n/en.yml new file mode 100644 index 000000000..87b6db047 --- /dev/null +++ b/_i18n/en.yml @@ -0,0 +1,98 @@ +lang: + english: "English" + polish: "Polski" +global: + further_reading: "Further Reading" +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" + start_search: "start search" +resources: + tools: "Privacy Tools" + classic: "Prefer the classic site? View a single-page layout." + providers: "Providers" + providers_description: "Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!" + browsers: "Web Browsers" + browsers_description: "Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks." + software: "Software" + software_description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure." + os: "Operating Systems" + os_description: "Find out how your operating system is comprimising your privacy, and what simple alternatives exist." + services: "Services" + services_description: "The privacytools.io team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!" + donate: "Donate" + donate_description: "We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating." +quotes: + header: "Privacy? I don't have anything to hide." + quotes: "Quotes" +privacy_resources: + note: "Note: Just being open source does not make software secure!" + header: "More Privacy Resources" + guides: "Guides" + guide1: "Surveillance Self-Defense by EFF" + guide1_d: "Guide to defending yourself from surveillance by using secure technology and developing careful practices." + guide2: "The Crypto Paper" + guide2_d: "Privacy, Security and Anonymity for Every Internet User." + guide3: "Email Self-Defense by FSF" + guide3_d: "A guide to fighting surveillance with GnuPG encryption." + guide4: "The Ultimate Privacy Guide" + guide4_d: "Excellent privacy guide written by the creators of the bestVPN.com website." + guide5: "IVPN Privacy Guides" + guide5_d: "These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation." + guide6: "The Ultimate Guide to Online Privacy" + guide6_d: 'Comprehensive "Ninja Privacy Tips" and 150+ tools.' + info1: "r/privacytoolsIO Wiki" + info1_d: "Our Wiki on reddit.com." + info2: "Security Now!" + info2_d: "Weekly Internet Security Podcast by Steve Gibson and Leo Laporte." + info3: "TechSNAP" + info3_d: "Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry." + info4: "Keybase.io" + info4_d: "Get a public key, safely, starting just with someone's social media username." + info5: "Freedom of the Press Foundation" + info5_d: "Supporting and defending journalism dedicated to transparency and accountability since 2012." + info6: "Erfahrungen.com" + info6_d: "German review aggregator website of privacy-related services." + info7: "Terms of Service; Didn't Read" + info7_d: '"I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.' + info8: "privacy.net" + info8_d: "What does the US government know about you?" + tool1: "ipleak.net" + tool1_d: "IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites." + tool2: "The ultimate Online Privacy Test Resource List" + tool2_d: "A collection of Internet sites that check whether your web browser leaks information." + tool3: "PRISM Break" + tool3_d: "We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services." + tool4: "Security in-a-Box" + tool4_d: "A guide to digital security for activists and human rights defenders throughout the world." + tool5: "SecureDrop" + tool5_d: "An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation." + tool6: "Reset The Net - Privacy Pack" + tool6_d: "Help fight to end mass surveillance. Get these tools to protect yourself and your friends." + tool7: "Security First" + tool7_d: "Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment." + tool8: "Block Cloudflare MiTM Attack" + tool8_d: "Firefox add-on to detect and block Cloudflare MITM attack." + tool9: "Osalt" + tool9_d: "A directory to help you find open source alternatives to proprietary tools." + tool10: "AlternativeTo" + tool10_d: "A directory to help find alternatives to other software, with the option to only show open source software." +participate: + participate: "Participate with suggestions and constructive criticism" + up_to_date: "It's important for a website like privacytools.io to stay up-to-date." + software_updates: "Keep an eye on software updates for the applications listed on our site." + follow_news: "Follow recent news about providers that we recommend." + keep_up: "We try our best to keep up, but we're not perfect and the internet is changing fast." + find_an_issue: "If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else..." + talk_to_us: "Talk to us please." + find_us_on: "You can also find us on" + mastodon: "our own Mastodon instance" + or: "or on" + at: "at" + discourse: "Join our Discourse community to stay up to date on privacy news or make suggestions!" + follow: "Follow us on" + mastodon: "Get the latest privacy-related updates from our Mastodon Feed. Follow us today!" + github: "Develop on GitHub" + github_d: "The complete website source code is available on GitHub. Join our developer team!" + contributors: "Contributor List" + thanks: "This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you." diff --git a/_i18n/pl.yml b/_i18n/pl.yml new file mode 100644 index 000000000..2a58c3498 --- /dev/null +++ b/_i18n/pl.yml @@ -0,0 +1,3 @@ +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" diff --git a/_includes/sections/header.html b/_includes/sections/header.html index 44dffd875..e54f64893 100644 --- a/_includes/sections/header.html +++ b/_includes/sections/header.html @@ -1,13 +1,13 @@

privacytools.io

-

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.

+

{% t header.lead %}

diff --git a/_includes/sections/participate.html b/_includes/sections/participate.html index a4ce8b999..0e5a28d40 100644 --- a/_includes/sections/participate.html +++ b/_includes/sections/participate.html @@ -1,8 +1,15 @@
-

Participate with suggestions and constructive criticism

+

{% t participate.participate %}

-

It's important for a website like privacytools.io to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... Talk to us please. You can also find us on our own Mastodon instance or on Matrix at #general:privacytools.io.

+

{% t participate.up_to_date %} {% t participate.software_updates %} {% t participate.follow_news %} {% t participate.keep_up %} {% t participate.find_an_issue %} {% t participate.talk_to_us %} {% t participate.find_us_on %} {% t participate.mastodon %} {% t participate.or %} Matrix {% t participate.at %} #general:privacytools.io.

+ +{%- capture discourse -%}{% t participate.discourse %}{%- endcapture -%} +{%- capture mastodon -%}{% t participate.follow %} Mastodon {% t participate.or %} Twitter{%- endcapture -%} +{%- capture mastodon2 -%}{% t participate.mastodon %}{%- endcapture -%} +{%- capture github -%}{% t participate.github %}{%- endcapture -%} +{%- capture github2 -%}{% t participate.github_d %}{%- endcapture -%} +{%- capture contrib -%}{% t participate.contributors %}{%- endcapture -%}
@@ -12,27 +19,27 @@

-

This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you.

+

{% t participate.thanks %}

diff --git a/_includes/sections/privacy-resources.html b/_includes/sections/privacy-resources.html index e4340e805..273e6880a 100644 --- a/_includes/sections/privacy-resources.html +++ b/_includes/sections/privacy-resources.html @@ -1,43 +1,42 @@ -

More Privacy Resources

+

{% t privacy_resources.header %}

-

Guides

+

{% t privacy_resources.guides %}

Information

Tools

-

Note: Just being open source does not make software secure!

+

{% t privacy_resources.note %}

diff --git a/_includes/sections/quotes.html b/_includes/sections/quotes.html index fed23a8ad..038f9d427 100644 --- a/_includes/sections/quotes.html +++ b/_includes/sections/quotes.html @@ -1,5 +1,5 @@
-

Privacy? I don't have anything to hide.

+

{% t quotes.header %}

Glenn Greenwald: Why privacy matters @@ -14,7 +14,7 @@

Privacy? I don't have anything to hide.

-

Read also:

+

{% t global.further_reading %}

-

Quotes

+

{% t quotes.quotes %}

Arguing that you don't care about the right to privacy because you have nothing to hide is no different than saying you don't care about free speech because you have nothing to say.

diff --git a/_includes/sections/resources.html b/_includes/sections/resources.html index 3cba057ae..03fb422f8 100644 --- a/_includes/sections/resources.html +++ b/_includes/sections/resources.html @@ -1,55 +1,68 @@ -

Privacy Tools

+

{% t resources.tools %}

-

Prefer the classic site? View a single-page layout.

+

{%t resources.classic %}

+ +{%- capture title1 -%}{% t resources.providers %}{%- endcapture -%} +{%- capture descr1 -%}{% t resources.providers_description %}{%- endcapture -%} +{%- capture title2 -%}{% t resources.browsers %}{%- endcapture -%} +{%- capture descr2 -%}{% t resources.browsers_description %}{%- endcapture -%} +{%- capture title3 -%}{% t resources.software %}{%- endcapture -%} +{%- capture descr3 -%}{% t resources.software_description %}{%- endcapture -%} +{%- capture title4 -%}{% t resources.os %}{%- endcapture -%} +{%- capture descr4 -%}{% t resources.os_description %}{%- endcapture -%} +{%- capture title5 -%}{% t resources.services %}{%- endcapture -%} +{%- capture descr5 -%}{% t resources.services_description %}{%- endcapture -%} +{%- capture title6 -%}{% t resources.donate %}{%- endcapture -%} +{%- capture descr6 -%}{% t resources.donate_description %}{%- endcapture -%}
{% include card.html color="success" - title="Providers" + title=title1 icon="fas fa-server" iconcolor="dark" page="/providers/" - description="Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!" + description=descr1 %} {% include card.html color="primary" - title="Web Browsers" + title=title2 icon="far fa-compass" iconcolor="dark" page="/browsers/" - description="Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks." + description=descr2 %} {% include card.html color="warning" - title="Software" + title=title3 icon="far fa-window-restore" iconcolor="dark" page="/software/" - description="Discover a variety of open source software built to protect your privacy and keep your digital data secure." + description=descr3 %} {% include card.html color="info" - title="Operating Systems" + title=title4 icon="fas fa-desktop" iconcolor="dark" page="/operating-systems/" - description="Find out how your operating system is comprimising your privacy, and what simple alternatives exist." + description=descr4 %} {% include card.html color="secondary" - title="privacytoolsIO Services" + title=title5 icon="far fa-eye-slash" iconcolor="dark" page="/services/" - description="The privacytools.io team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!" + description=descr5 %} {% include card.html color="danger" - title="Donate" + title=title6 icon="fas fa-donate" iconcolor="dark" page="/donate/" - description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating." + description=descr6 %}
From 0def00c9f90b146c6232471682507806022aba8d Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 10:56:48 -0500 Subject: [PATCH 04/34] Add donate.html to en.yml --- _i18n/en.yml | 13 ++++++++++++- donate.html | 12 ++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 87b6db047..9138d7070 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -26,7 +26,6 @@ quotes: header: "Privacy? I don't have anything to hide." quotes: "Quotes" privacy_resources: - note: "Note: Just being open source does not make software secure!" header: "More Privacy Resources" guides: "Guides" guide1: "Surveillance Self-Defense by EFF" @@ -77,6 +76,7 @@ privacy_resources: tool9_d: "A directory to help you find open source alternatives to proprietary tools." tool10: "AlternativeTo" tool10_d: "A directory to help find alternatives to other software, with the option to only show open source software." + note: "Note: Just being open source does not make software secure!" participate: participate: "Participate with suggestions and constructive criticism" up_to_date: "It's important for a website like privacytools.io to stay up-to-date." @@ -96,3 +96,14 @@ participate: github_d: "The complete website source code is available on GitHub. Join our developer team!" contributors: "Contributor List" thanks: "This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you." +donate: + cta: "Please Donate" + ad_free: "Our website is free of advertisements and not affiliated with any listed providers." + costs: "Your donation will cover our costs for servers, domains, coffee, beer, and pizza." + bitcoin: "We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees." + bitcoin2: "You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar." + more: "More Cryptocurrencies" + the: "The" + team: "privacytools.io team" + endorse: "does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies." + thanks: "Thanks for your support. You are awesome!" diff --git a/donate.html b/donate.html index 5b68b094d..4521778bb 100644 --- a/donate.html +++ b/donate.html @@ -9,8 +9,8 @@
privacytools.io
-

Please Donate

-

Our website is free of advertisements and not affiliated with any listed providers.
Your donation will cover our costs for servers, domains, coffee, beer, and pizza.

+

{% t donate.cta %}

+

{% t donate.ad_free %}
{% t donate.costs %}

Liberapay @@ -73,9 +73,9 @@

Please Donate

-

We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees. You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar.

+

{% t donate.bitcoin %} {% t donate.bitcoin2 %}

-

More Cryptocurrencies

+

{% t donate.more %}

@@ -277,8 +277,8 @@

More Cryptocurrencies

-

The privacytools.io team does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.

-

Thanks for your support. You are awesome!

+

{% t donate.the %} {% t donate.team %} {% t donate.endorse %}

+

{% t donate.thanks %}

Smile

From d4568f509be3ff3bf2f2d63974a0441674bf4460 Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 16:10:39 -0500 Subject: [PATCH 05/34] Fix participate section --- _i18n/en.yml | 8 +++++++- _includes/sections/participate.html | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 9138d7070..ebee1398c 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -91,7 +91,7 @@ participate: at: "at" discourse: "Join our Discourse community to stay up to date on privacy news or make suggestions!" follow: "Follow us on" - mastodon: "Get the latest privacy-related updates from our Mastodon Feed. Follow us today!" + mastodon_follow: "Get the latest privacy-related updates from our Mastodon Feed. Follow us today!" github: "Develop on GitHub" github_d: "The complete website source code is available on GitHub. Join our developer team!" contributors: "Contributor List" @@ -107,3 +107,9 @@ donate: team: "privacytools.io team" endorse: "does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies." thanks: "Thanks for your support. You are awesome!" +contact: + title: "Contact Us" + description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues." + 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." diff --git a/_includes/sections/participate.html b/_includes/sections/participate.html index 0e5a28d40..ca814265c 100644 --- a/_includes/sections/participate.html +++ b/_includes/sections/participate.html @@ -6,7 +6,7 @@

{% t participate.contributors %}{%- endcapture -%} From 82b94ec597d36ee5dff0d20726f13c0e7e3d026d Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 16:22:44 -0500 Subject: [PATCH 06/34] Add contact.md to en.yml --- Gemfile | 3 ++- _config.yml | 1 + _i18n/en.yml | 14 +++++++++++++ _layouts/page.html | 4 ++-- _plugins/expand_nested_variable_filter.rb | 9 +++++++++ contact.md | 24 +++++++++++------------ 6 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 _plugins/expand_nested_variable_filter.rb diff --git a/Gemfile b/Gemfile index 2e4281ba6..be47f8e09 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 73caaac51..5bd7b3cb2 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 ebee1398c..25f6511e7 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 4a137c66d..985abb5c0 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -3,8 +3,8 @@ ---
-

{{ 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 000000000..c0762dc26 --- /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 c4d021450..10a985e54 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

From deeeab1fcf20c28289d548af15d26eaf3c34d2a5 Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 16:31:30 -0500 Subject: [PATCH 07/34] Fix syntax error --- contact.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contact.md b/contact.md index 10a985e54..0ad0d4bdf 100644 --- a/contact.md +++ b/contact.md @@ -9,7 +9,7 @@ description: "{% t contact.description %}" {% t contact.up_to_date %} {% t contact.reach_out %} -[ {% t contact.start_discussion }](https://forum.privacytools.io/) +[ {% t contact.start_discussion %}](https://forum.privacytools.io/) [ {% t contact.open_an_issue %}](https://github.com/privacytoolsIO/privacytools.io/issues) From fc99d7e9387418b5ba90c63a6312a7fa35cfe5e8 Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 16:44:10 -0500 Subject: [PATCH 08/34] Flatify titles/descriptions --- _includes/head.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index d2fb0f515..4130822ba 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -12,8 +12,8 @@ {% if page.title %} - {{ page.title }} | privacytools.io - + {{ page.title | flatify }} | privacytools.io + {% else %} {{ site.title }} @@ -21,7 +21,7 @@ - + From 491e7c0c9ba0bd1e17057f9bd4c1516dd52da9d2 Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 16:57:47 -0500 Subject: [PATCH 09/34] Fix tags --- contact.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contact.md b/contact.md index 0ad0d4bdf..5c9966fe3 100644 --- a/contact.md +++ b/contact.md @@ -30,8 +30,8 @@ description: "{% t contact.description %}" GitHub Issues From 419443c3c294674d759ad5979383e5d170961b75 Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 6 Aug 2019 18:39:53 -0500 Subject: [PATCH 10/34] Add nav.html to en.yml --- _i18n/en.yml | 57 +++++++++++++++++++++++++-- _includes/nav.html | 98 +++++++++++++++++++++++----------------------- 2 files changed, 103 insertions(+), 52 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 25f6511e7..88a9db5cf 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -1,9 +1,60 @@ -lang: - english: "English" - polish: "Polski" global: further_reading: "Further Reading" new: "New" + home: "Home" + participate: "Participate" + language: "Language" +aria: + nav_toggle: "Toggle navigation" +service_descriptions: + services: "Services" + discourse: "Forum" + gitea: "Git-Repository Manager" + mastodon: "Social Network" + matrix: "Federated Chat" + privatebin: "Encrypted Pastebin" + searx: "Privacy Friendly Searx" + writefreely: "Federated Blog" +provider: + provider: "Provider" + us_uk: "Avoid US & UK services" + cloud_storage: "Cloud Storage" + dns: "DNS" + email: "Email" + hosting: "Hosting" + pastebins: "Pastebins" + search_engines: "Search Engines" + social_networks: "Social Networks" + vpn: "VPN" +browser: + browser: "Browser" + fingerprint: "Fingerprint" + privacy_addons: "Firefox Privacy Add-ons" + tweaks: "Privacy Related Tweaks" + recommendations: "Recommendations" + webrtc_ip_leak: "WebRTC IP Leak" +software: + software: "Software" + notebook: "Digital Notebooks" + email_alt: "Email Alternatives" + email_clients: "Email Clients" + file_encryption: "File Encryption" + file_sharing: "File Sharing" + im: "Instant Messengers" + password_managers: "Password Managers" + productivity: "Productivity Tools" + file_sync: "Secure File Sync" + networks: "Self Contained Networks" + cloud: "Self-Hosted Cloud Server" + voip: "Video & Voice Messenger" +os: + os: "OS" + android_addons: "Android Privacy Add-ons" + windows_10: "Don't use Windows 10" + live_cd: "Live CD OS" + mobile: "Mobile OS" + pc_os: "PC OS" + router: "Router Firmware" 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" diff --git a/_includes/nav.html b/_includes/nav.html index 4aa486ea6..127b16d40 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,82 +1,82 @@