July 2021 - tor-commits - lists.torproject.org

[donate-static/master] Create new layout.html template
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 796bca69392e5b0821d8cae892dce531412f3359 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 10:06:37 2021 -0400 Create new layout.html template --- templates/layout.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/templates/layout.html b/templates/layout.html index f83df290..b0163d4e 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,16 +1,14 @@ {% include 'meta.html' %} +<body> <div class="page pt-4"> {% include 'header.html' %} <div class="container-fluid"> <div class="row flex-xl-nowrap"> {% set locale = bag('alternatives', this.alt) %} <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> - {% if this.section_id != 'donate' %} - <div class="container py-3 mt-5 content"> - {{ this.body }} - </div> - {% endif %} - {% include this.html %} + {% if this.section_id != 'donate' %}<div class="container py-3 mt-5 content">{% endif %} + {% block content %}{% endblock %} + {% if this.section_id != 'donate' %}</div>{% endif %} </main> </div> </div>

1 0

[donate-static/master] Make donate-form.html extend the new layout template
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit e5ecad9b65268c2ee6c1beb0f779e2f36cc8ea47 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 10:07:01 2021 -0400 Make donate-form.html extend the new layout template --- templates/donate-form.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/donate-form.html b/templates/donate-form.html index f40052cb..e2f8bd67 100644 --- a/templates/donate-form.html +++ b/templates/donate-form.html @@ -1,3 +1,5 @@ +{% extends "layout.html" %} +{% block content %} <div> {{ this.intro }} </div> @@ -197,3 +199,4 @@ } </script> <script type="text/javascript" src="{{ '/static/gen/donate.js' | asseturl }}"></script> +{% endblock %}

1 0

[donate-static/master] Move the remaining donate-pages to new layout template
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit a8bf30da43b63bc90073c375c0c41175c88388e7 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 14:34:40 2021 -0400 Move the remaining donate-pages to new layout template --- content/cryptocurrency/contents.lr | 5 +---- content/donate-thank-you/contents.lr | 4 +--- content/donor-faq/contents.lr | 4 +--- content/privacy-policy/contents.lr | 4 +--- content/state-disclosures/contents.lr | 4 +--- models/donate-page.ini | 4 ---- templates/donate-empty.html | 3 ++- 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/content/cryptocurrency/contents.lr b/content/cryptocurrency/contents.lr index d6403d1d..c49fd436 100644 --- a/content/cryptocurrency/contents.lr +++ b/content/cryptocurrency/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- title: Cryptocurrency --- @@ -88,6 +88,3 @@ body: If you have any questions, or would like to donate a cryptocurrency not listed below, please email us at giving(a)torproject.org. </p> </div> - ---- -html: cryptocurrency.html diff --git a/content/donate-thank-you/contents.lr b/content/donate-thank-you/contents.lr index a2f2302f..74c7206c 100644 --- a/content/donate-thank-you/contents.lr +++ b/content/donate-thank-you/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- title: Thank You --- @@ -36,5 +36,3 @@ We need people to run relays, write code, organize the community and spread the Learn how you can help. <hr> <a class="btn btn-primary" href="https://community.torproject.org/" target="_blank">I Want To Volunteer</a> ---- -html: donate-empty.html diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr index ef5be450..ecdd955f 100644 --- a/content/donor-faq/contents.lr +++ b/content/donor-faq/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- section_id: donate --- @@ -249,5 +249,3 @@ body: </div> </div> </div> ---- -html: donate-empty.html diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr index 81b4db9a..ce626881 100644 --- a/content/privacy-policy/contents.lr +++ b/content/privacy-policy/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- title: Donor Privacy Policy --- @@ -10,8 +10,6 @@ section: Donate --- color: primary --- -html: donate-empty.html ---- body: <div class="privacy-policy"> diff --git a/content/state-disclosures/contents.lr b/content/state-disclosures/contents.lr index 77c08861..4085d0b3 100644 --- a/content/state-disclosures/contents.lr +++ b/content/state-disclosures/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- section_id: donate --- @@ -38,5 +38,3 @@ body: </div> </div> </div> ---- -html: donate-empty.html diff --git a/models/donate-page.ini b/models/donate-page.ini index bd441c6e..577e3675 100644 --- a/models/donate-page.ini +++ b/models/donate-page.ini @@ -41,7 +41,3 @@ translate = True [fields.color] label = Color type = string - -[fields.html] -label = Html -type = string diff --git a/templates/donate-empty.html b/templates/donate-empty.html index ba2adc27..85d11b6a 100644 --- a/templates/donate-empty.html +++ b/templates/donate-empty.html @@ -1,4 +1,5 @@ -{% block body %} +{% extends "layout.html" %} +{% block content %} <div class="donate-page"> <div class="donate-page-wrapper {{ this.page_type }}"> {{ this.body }}

1 0

[donate-static/master] Merge branch 'kez-fix-footer-links-again'
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 0654a66fbd4df60b93c4655c9604dc3f925f6eda Merge: e11a0007 cf0f3080 Author: gus <gus(a)torproject.org> Date: Thu Jul 8 11:29:18 2021 -0300 Merge branch 'kez-fix-footer-links-again' templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[donate-static/master] Move the final template to the new layout, remove legacy layout
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit e11a0007c0d88324ce6656b85ae1e326d1ba36c1 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 16:18:53 2021 -0400 Move the final template to the new layout, remove legacy layout --- templates/page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/page.html b/templates/page.html index 04305772..aa7a2cec 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} {% block title %}{{ this.title }}{% endblock %} -{% block body %} +{% block content %} <h2>{{ this.title }}</h2> {{ this.body }} {% endblock %}

1 0

[manual/master] s/they/the
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 9b04d787aa8a9e865d00234169c0992900e3cfae Author: nyxnor <nyxnor(a)protonmail.com> Date: Fri Jul 2 13:13:27 2021 +0000 s/they/the --- content/onion-services/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index 67e7b6a..79bce87 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -70,6 +70,6 @@ If you cannot reach the onion service you requested, make sure that you have ent If you are still unable to connect to the onion service after verifying the address, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning. -If they onion service you are trying to access consists of a string of 16 characters (V2 format), this type of address is [being deprecated](https://support.torproject.org/onionservices/v2-deprecation/). +If the onion service you are trying to access consists of a string of 16 characters (V2 format), this type of address is [being deprecated](https://support.torproject.org/onionservices/v2-deprecation/). You can also test if you are able to access other onion services by connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/).

1 0

[manual/master] onion service page mention about v2 deprecation on troubleshooting and remove it from the main part
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 28cf02d8524357a0b6fcf451aece450a9db7953d Author: nyxnor <nyxnor(a)protonmail.com> Date: Fri Jul 2 00:36:58 2021 +0000 onion service page mention about v2 deprecation on troubleshooting and remove it from the main part --- content/onion-services/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index 8334f0c..67e7b6a 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -20,7 +20,7 @@ Onion services offer several advantages over ordinary services on the non-privat ### HOW TO ACCESS AN ONION SERVICE -Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of 16 (and in V3 format, 56) mostly random letters and numbers, followed by ".onion". +Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of 56 mostly random letters and numbers, followed by ".onion". When accessing a website that uses an onion service, Tor Browser will show in the URL bar an icon of an onion displaying the state of your connection: secure and using an onion service. You can learn more about the onion site that you are visiting by looking at the Circuit Display. @@ -70,4 +70,6 @@ If you cannot reach the onion service you requested, make sure that you have ent If you are still unable to connect to the onion service after verifying the address, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning. +If they onion service you are trying to access consists of a string of 16 characters (V2 format), this type of address is [being deprecated](https://support.torproject.org/onionservices/v2-deprecation/). + You can also test if you are able to access other onion services by connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/).

1 0

[manual/master] Merge branch 'onion-services-page'
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 93bbb67af7c943d71483f62c3d80fe892d0309f8 Merge: f92e5e5 9b04d78 Author: gus <gus(a)torproject.org> Date: Thu Jul 8 11:20:27 2021 -0300 Merge branch 'onion-services-page' content/onion-services/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 08 Jul '21

08 Jul '21

commit cf54d9bae45618d444c1a23a71b1da63ac70bec1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 8 14:17:38 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+pl.po | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index b2ebf564c1..b11c0bdc78 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -14,8 +14,8 @@ # Gus, 2020 # erinm, 2021 # Emma Peel, 2021 -# Waldemar Stoczkowski, 2021 # Kristian <geezet(a)riseup.net>, 2021 +# Waldemar Stoczkowski, 2021 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 19:01+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Kristian <geezet(a)riseup.net>, 2021\n" +"Last-Translator: Waldemar Stoczkowski, 2021\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -706,12 +706,12 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.title) msgid "Tor Browser 10.5" -msgstr "" +msgstr "Przeglądarka Tor 10.5" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "## New Release: Tor Browser 10.5" -msgstr "" +msgstr "## Nowe wydanie: Przeglądarka Tor 10.5" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -719,6 +719,8 @@ msgid "" "Tor Browser 10.5 is now available from the Tor Browser download page and our" " distribution directory." msgstr "" +"Przeglądarka Tor 10.5 jest teraz dostępna na stronie pobierania Przeglądarki" +" Tor i w naszym katalogu dystrybucyjnym." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -726,11 +728,13 @@ msgid "" "The Android version is also available from Google Play and should be " "available from F-Droid within the next day." msgstr "" +"Wersja na Androida jest również dostępna w Google Play i powinna być " +"dostępna w F-Droid w ciągu następnego dnia." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "This release includes important security updates to Firefox." -msgstr "" +msgstr "Ta wersja zawiera ważne aktualizacje zabezpieczeń Firefoksa." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -738,11 +742,13 @@ msgid "" "This new Tor Browser release is focussed on improving the internet access of" " users connecting through Tor in censored contexts." msgstr "" +"Ta nowa wersja Przeglądarki Tor koncentruje się na poprawie dostępu do " +"Internetu użytkownikom łączących się z Torem w ocenzurowanych kontekstach." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "### What's new?" -msgstr "" +msgstr "### Co nowego?" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -917,7 +923,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Give Feedback" -msgstr "" +msgstr "#### Zostaw opinię" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.title)

1 0

[tpo/master] Merge remote-tracking branch 'gitlab-tpo/add-kez'
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 451ce0e63436b8b8a5e14d11eabc82297dceb1a9 Merge: 04d00679 29b0ac13 Author: gus <gus(a)torproject.org> Date: Thu Jul 8 11:09:58 2021 -0300 Merge remote-tracking branch 'gitlab-tpo/add-kez' content/about/people/kez/contents.lr | 2 -- 1 file changed, 2 deletions(-)

1 0