tor-commits April 2020

tor-commits@lists.torproject.org

25 participants
2156 discussions

[bridgedb/develop] Simplify command for requesting obfs4 bridges.
by phw＠torproject.org 07 Apr '20

07 Apr '20

commit 8b4a087cc2278883e1383ac786ebdee74adcd548 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Apr 7 10:15:29 2020 -0700 Simplify command for requesting obfs4 bridges. Thanks to Roger for suggesting this. --- bridgedb/i18n/templates/bridgedb.pot | 11 +++++------ bridgedb/strings.py | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index 65f8ca6..85958bd 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.10.0+8.g97621c0\n" +"Project-Id-Version: bridgedb 0.10.0+7.gbca6496.dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2020-04-06 13:53-0700\n" +"POT-Creation-Date: 2020-04-07 10:14-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -422,14 +422,13 @@ msgstr "" msgid "(Request IPv6 bridges.)" msgstr "" -#. TRANSLATORS: Please DO NOT translate the word "TYPE". -#: bridgedb/strings.py:185 -msgid "(Request obfuscated bridges. Replace TYPE with 'obfs4'.)" +#: bridgedb/strings.py:184 +msgid "(Request obfs4 obfuscated bridges.)" msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:189 +#: bridgedb/strings.py:187 msgid "(Get a copy of BridgeDB's public GnuPG key.)" msgstr "" diff --git a/bridgedb/strings.py b/bridgedb/strings.py index f3ea849..6bccf81 100644 --- a/bridgedb/strings.py +++ b/bridgedb/strings.py @@ -181,9 +181,7 @@ bridge" field."""), EMAIL_COMMANDS = { "get bridges": _("(Request unobfuscated Tor bridges.)"), "get ipv6": _("(Request IPv6 bridges.)"), - # TRANSLATORS: Please DO NOT translate the word "TYPE". - "get transport TYPE": _("(Request obfuscated bridges. Replace TYPE with " - "'obfs4'.)"), + "get transport obfs4": _("(Request obfs4 obfuscated bridges.)"), # TRANSLATORS: Please DO NOT translate "BridgeDB". # TRANSLATORS: Please DO NOT translate "GnuPG". "get key": _("(Get a copy of BridgeDB's public GnuPG key.)"),

1 0

[lego/develop] Update banner elements order
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 116fa263a3d0906cb8c5f496da75e0a2a3210a6e Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 16:02:19 2019 +0100 Update banner elements order --- templates/banner.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/banner.html b/templates/banner.html index ef41d86..b22d513 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -11,12 +11,12 @@ <h4 class="tracking-surveillan">{{ _('Tracking, surveillance, and censorship are widespread online.') }}</h4> </div> <div class="row"> - <div class="col-6 {{ locale.order }}"> + <div class="col-6 order-first"> <h2 class="take-back-the-intern display-3 py-3"> {{ _('TAKE BACK THE INTERNET WITH TOR') }} </h2> </div> - <div class="col-6 order-1"> + <div class="col-6 order-last"> </div> </div> <div class="row">

1 0

[lego/develop] Update banner elements order
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 767506c7d523c27c22fff72d09b04b74bc4a4b42 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 16:03:40 2019 +0100 Update banner elements order --- templates/banner.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/banner.html b/templates/banner.html index b22d513..41578dd 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -11,12 +11,12 @@ <h4 class="tracking-surveillan">{{ _('Tracking, surveillance, and censorship are widespread online.') }}</h4> </div> <div class="row"> - <div class="col-6 order-first"> + <div class="col-6 order-1"> <h2 class="take-back-the-intern display-3 py-3"> {{ _('TAKE BACK THE INTERNET WITH TOR') }} </h2> </div> - <div class="col-6 order-last"> + <div class="col-6 {{ locale.order }}"> </div> </div> <div class="row">

1 0

[lego/develop] Update footer
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit cc7a928f382ad7d5f02b1d61e1802040ff94a5c4 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:28:31 2019 +0100 Update footer --- templates/footer.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 6204c9f..d724a48 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -60,7 +60,7 @@ {% endif %} </div> </div> - <div class="col-12 d-flex justify-content-center"> + <div class="col-12 d-flex justify-content-center border"> <div class="col-sm-6 offset-lx-1 offset-md-2 offset-sm-0 mt-5 mt-5 pb-5"> <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p> <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p> @@ -96,10 +96,10 @@ <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a> {% endif %} {% endfor %} - </div> + </div> + </div> </div> </div> - <script src="{{ '/static/js/jquery-3.2.1.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/popper.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/bootstrap.bundle.min.js'|asseturl }}" ></script> @@ -108,3 +108,4 @@ <script src="{{ '/static/js/download.js'|asseturl }}" ></script> <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> </div> +</div>

1 0

[lego/develop] Update banner elements order
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 1bc98ec68273dc4d4e3a0afd5f27a0e304b03ec6 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 16:09:30 2019 +0100 Update banner elements order --- templates/banner.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/banner.html b/templates/banner.html index f801f3f..7c14b6c 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -11,7 +11,11 @@ <h4 class="tracking-surveillan">{{ _('Tracking, surveillance, and censorship are widespread online.') }}</h4> </div> <div class="row"> - <div class="col-6 order-0"> + {% if locale.direction == 'text-right' %} + <div class="col-6 order-1"> + {% else %} + <div class="col-6 order-0"> + {% endif %} <h2 class="take-back-the-intern display-3 py-3"> {{ _('TAKE BACK THE INTERNET WITH TOR') }} </h2>

1 0

[lego/develop] Update footer
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit d892ab188dbc30f5827c93fc851506e383b48715 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:31:04 2019 +0100 Update footer --- templates/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index d724a48..7f45ce0 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -61,12 +61,12 @@ </div> </div> <div class="col-12 d-flex justify-content-center border"> - <div class="col-sm-6 offset-lx-1 offset-md-2 offset-sm-0 mt-5 mt-5 pb-5"> + <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p> <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p> <p class="w"><a class="btn btn-small btn-dark mt-2 text-white text-uppercase active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/">{{ _('Sign up') }}</a></p> </div> - <div class="col-md-4 col-lg-4 ml-2 mt-5 pb-5"> + <div class="col-sm-2 mt-5 d-none d-sm-block"> <div class="row"> <h4><a class="text-white px-3" target="_blank" href="https://www.facebook.com/TorProject/"><i class="fab fa-facebook-png"></i></a></h4> <h4><a class="mastodon text-white px-3" target="_blank" href="https://mastodon.social/@torproject"><i class="fab fa-mastodon-png"></i></a></h4>

1 0

[lego/develop] Update banner elements order
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 017f52ee58b6dc174842870d8629c00f57cd72ca Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 16:07:29 2019 +0100 Update banner elements order --- templates/banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/banner.html b/templates/banner.html index eff7844..f801f3f 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -16,7 +16,7 @@ {{ _('TAKE BACK THE INTERNET WITH TOR') }} </h2> </div> - <div class="col-6 {{ locale.order }}"> + <div class="col-6 order-1"> </div> </div> <div class="row">

1 0

[lego/develop] Update banner with locale directions
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit a978e132949bb4e0ce9b97626ee8d9b24acef523 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:37:17 2019 +0100 Update banner with locale directions --- templates/banner.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/banner.html b/templates/banner.html index 37d49be..8ba6e5e 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -1,11 +1,12 @@ +{% set locale = bag('alternatives', this.alt) %} <div class="banner__containter banner align-middle d-flex justify-content-center p-0"> - <input id="trigger" type="checkbox" title="{{ _('Close banner') }}" /> - <label for="trigger" class="footer__close text-white">X</label> - <span class="eoy-sr-only text-white">{{ _('Close banner') }}</span> + <input id="trigger" type="checkbox" title="{{ _('Close banner') }}" /> + <label for="trigger" class="footer__close text-white">X</label> + <span class="eoy-sr-only text-white">{{ _('Close banner') }}</span> <div class="eoy-banner row col-md-12" id="banner-header" role="contentinfo"> <div class="col-lg-3 col-md-1"></div> <div class="col-lg-6 col-md-10"> - <div class="col-12 p-5"> + <div class="col-12 p-5 {{ locale.order }} {{ locale.direction }}"> <div class="row"> <h4 class="tracking-surveillan">{{ _('Tracking, surveillance, and censorship are widespread online.') }}</h4> </div>

1 0

[lego/develop] Fix banner
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 28c7058b9e3349ac69843c91dd6b690235bc9bf0 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:53:39 2019 +0100 Fix banner --- templates/banner.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/banner.html b/templates/banner.html index 25b070a..530fdbc 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -11,12 +11,12 @@ <h4 class="tracking-surveillan">{{ _('Tracking, surveillance, and censorship are widespread online.') }}</h4> </div> <div class="row"> - <div class="col-6 order-first"> + <div class="col-6"> <h2 class="take-back-the-intern display-3 py-3"> {{ _('TAKE BACK THE INTERNET WITH TOR') }} </h2> </div> - <div class="col-6"> + <div class="col-6 {{ locale.order }}"> </div> </div> <div class="row">

1 0

[lego/develop] Update banner for rtl languages
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 18bed7f50ecab41945e3ba67e04bd15f1774071a Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:48:11 2019 +0100 Update banner for rtl languages --- assets/scss/_eoy.scss | 2 +- templates/banner.html | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/scss/_eoy.scss b/assets/scss/_eoy.scss index 14b5487..2f1584e 100644 --- a/assets/scss/_eoy.scss +++ b/assets/scss/_eoy.scss @@ -85,7 +85,7 @@ padding: 1.25rem 1.25rem 2rem; width: 100%; background-image: url('../images/home/png/take-back(a)3x.png'); - background-position: bottom 10% right 45%; + background-position: bottom 10% right 35%; background-repeat: no-repeat; background-size: contain; } diff --git a/templates/banner.html b/templates/banner.html index 8ba6e5e..23ca029 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -11,9 +11,12 @@ <h4 class="tracking-surveillan">{{ _('Tracking, surveillance, and censorship are widespread online.') }}</h4> </div> <div class="row"> - <h2 class="take-back-the-intern display-3 py-3"> - {{ _('TAKE BACK THE INTERNET WITH TOR') }} - </h2> + <div class="col-6"> + <h2 class="take-back-the-intern display-3 py-3"> + {{ _('TAKE BACK THE INTERNET WITH TOR') }} + </h2> + <div class="col-6"> + </div> </div> <div class="row"> {% set link = bag('links', this.alt, 'donate') %}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2020