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

[community/staging] Merge branch 'master' of git-rw.torproject.org:project/web/community into staging
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 4b278adda3238ecabc817c10bedeaca06a8086d3 Merge: 46c6d92 9831657 Author: gus <gus(a)torproject.org> Date: Thu Apr 15 15:32:25 2021 -0300 Merge branch 'master' of git-rw.torproject.org:project/web/community into staging .htaccess | 2 +- community.lektorproject | 8 +- configs/i18n.ini | 2 +- .../community-resources/good-bad-isps/contents.lr | 5 +- .../bridge/centos-rhel-opensuse/contents.lr | 4 +- .../bridge/debian-ubuntu/contents.lr | 2 +- .../technical-setup/bridge/docker/contents.lr | 14 +++- .../bridge/dragonflybsd/contents.lr | 2 +- .../technical-setup/bridge/fedora/contents.lr | 2 +- .../technical-setup/bridge/freebsd/contents.lr | 2 +- .../technical-setup/bridge/netbsd/contents.lr | 2 +- .../technical-setup/bridge/openbsd/contents.lr | 2 +- .../bridge/post-install/contents.lr | 2 +- .../technical-setup/guard/fedora/contents.lr | 25 +++--- .../technical-setup/guard/windows/contents.lr | 93 ++++++++++++++++++++++ content/user-research/guidelines/contents.lr | 30 +++++-- content/user-research/how-to-volunteer/contents.lr | 70 ++++++++++++++++ content/user-research/open/contents.lr | 20 +---- content/user-research/persona/contents.lr | 11 +-- content/user-research/reports/contents.lr | 36 +++++++++ databags/alternatives.ini | 6 +- models/page.ini | 1 + models/text.ini | 2 + templates/home.html | 8 +- templates/homepage.html | 9 ++- templates/layout.html | 3 +- templates/onion-services.html | 2 +- templates/outreach-talk.html | 2 +- templates/pagenav.html | 2 +- templates/relay-operations.html | 2 +- templates/two-columns-page.html | 2 +- 31 files changed, 294 insertions(+), 79 deletions(-)

1 0

[community/staging] Merge branch 'add-ux-page-volunteer-new-report'
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 009a4a96dca29e15361f49e33a8bd73f6e3fde65 Merge: bd95258 0f657cf Author: gus <gus(a)torproject.org> Date: Tue Apr 13 15:24:45 2021 -0300 Merge branch 'add-ux-page-volunteer-new-report' content/user-research/guidelines/contents.lr | 11 +++-- content/user-research/how-to-volunteer/contents.lr | 54 ++++++++++++++++++++++ content/user-research/reports/contents.lr | 3 ++ 3 files changed, 65 insertions(+), 3 deletions(-)

1 0

[community/staging] Remove extra spaces
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 98316577da55991f63848521a4bf0a7dd75cd391 Author: gus <gus(a)torproject.org> Date: Wed Apr 14 08:56:19 2021 -0300 Remove extra spaces --- content/user-research/how-to-volunteer/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/user-research/how-to-volunteer/contents.lr b/content/user-research/how-to-volunteer/contents.lr index b3a5c81..754db35 100644 --- a/content/user-research/how-to-volunteer/contents.lr +++ b/content/user-research/how-to-volunteer/contents.lr @@ -8,8 +8,8 @@ body: If this is your first time running a User Research session for the Tor Project, we recommend starting with one of these studies. Both can be conducted on a rolling basis and ran remotely. -- [Usability Testing Tor Browser Desktop](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script… -- [Discovery Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script… +- [Usability Testing Tor Browser Desktop](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script… +- [Discovery Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script… After choosing which study to run, open an issue in our [GitLab page](https://gitlab.torproject.org/tpo/ux/research). Add the title of your research, then select the Usability Testing template option and fill it in.

1 0

[community/staging] reduce locales in config, correct .htaccess file to prevent 404s, make model translatable
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 1a1b0492b664ed6e41a773fb7e2a1816ab80acc0 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 25 08:10:43 2021 +0100 reduce locales in config, correct .htaccess file to prevent 404s, make model translatable --- .htaccess | 2 +- community.lektorproject | 8 ++++---- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 +++--- models/page.ini | 1 + models/text.ini | 2 ++ 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.htaccess b/.htaccess index 548371a..1e7a96d 100644 --- a/.htaccess +++ b/.htaccess @@ -9,7 +9,7 @@ RewriteRule ^(en|en-US)$ / [R=302,L] RewriteRule ^(en|en-US)/(.*) /$2 [R=302,L] # Rewrites for languages that have a different mapping in the page than in TBB -RewriteRule ^(es-ES|es-MX|es-CO)(.*) /es$2 [R=302,L] +RewriteRule ^(es-ES|es-MX|es-CO|es-AR)(.*) /es$2 [R=302,L] # we have only one translation for this locales RewriteRule ^(bn-BD|bn-IN)(.*) /bn$2 [R=302,L] diff --git a/community.lektorproject b/community.lektorproject index 1725581..b933b44 100644 --- a/community.lektorproject +++ b/community.lektorproject @@ -10,8 +10,8 @@ primary = yes url_prefix = / locale = en -[alternatives.es-AR] -name = Español Arg (es-AR) +[alternatives.es] +name = Español (es) primary = yes -url_prefix = /es-AR/ -locale = es-AR +url_prefix = /es/ +locale = es diff --git a/configs/i18n.ini b/configs/i18n.ini index 38f6d4b..53c9865 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = es,es-AR,de,fr,it,pt-BR,ru +translations = es i18npath = i18n translate_paragraphwise = False url_prefix = https://community.torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 1bd9fd2..f2a0d37 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,8 +4,8 @@ order = order-last url = / language = English (en) -[es-AR] +[es] direction = text-left order = order-last -url = /es-AR/ -language = Español Arg. (es-AR) +url = /es/ +language = Español diff --git a/models/page.ini b/models/page.ini index 0671112..61ad278 100644 --- a/models/page.ini +++ b/models/page.ini @@ -15,6 +15,7 @@ translate = True [fields.section] label = Section type = string +translate = True [fields.cta] label = Call To Action diff --git a/models/text.ini b/models/text.ini index 75e24ba..380668d 100644 --- a/models/text.ini +++ b/models/text.ini @@ -1,7 +1,9 @@ [model] name = Text label = Text +translate = True [fields.body] label = Body type = text +translate = True

1 0

[community/staging] Merge branch 'update-user-research'
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 53a51439a1cdd4245eb89d5b174619be8da8d1ad Merge: 1a1b049 a21f47a Author: gus <gus(a)torproject.org> Date: Fri Mar 26 20:04:22 2021 -0300 Merge branch 'update-user-research' content/user-research/persona/contents.lr | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[community/staging] replacing gitlab links to avoid redirects
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit a21f47adf006ce75b4f3bd7dd69b90e5424ccab7 Author: nah <nah(a)riseup.net> Date: Mon Mar 22 10:03:42 2021 -0300 replacing gitlab links to avoid redirects new links for downloading personas --- content/user-research/persona/contents.lr | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/content/user-research/persona/contents.lr b/content/user-research/persona/contents.lr index 147cee9..33efd66 100644 --- a/content/user-research/persona/contents.lr +++ b/content/user-research/persona/contents.lr @@ -15,13 +15,14 @@ key: 4 html: two-columns-page.html --- body: + Persona is a tool that represents the needs, thoughts, and goals of the target user. We created personas because they help us to drive human-centered design processes. As part of our global south travels during 2018 and 2019, we got the lucky chance to meet a lot of different Tor users: from activists to journalists, all of them with different motivations, but demanding a usable private and secure tool to access the Internet. With the Community Team, we have been working collecting and mapping real user stories and finding patterns across them. It is how our Personas emerged from our in field research. ### Tor Personas -* [Jelani, the human rights defender](https://dip.torproject.org/torproject/ux/research/tree/master/per… -* [Aleisha, the privacy looker](https://dip.torproject.org/torproject/ux/research/tree/master/perso… -* [Fernanda, the feminist activist](https://dip.torproject.org/torproject/ux/research/tree/master/per… -* [Fatima, the censored user](https://dip.torproject.org/torproject/ux/research/tree/master/persona… -* [Alex, the fearless journalist](https://dip.torproject.org/torproject/ux/research/tree/master/p… +* Jelani, the human rights defender: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/jel… +* Aleisha, the privacy looker: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/ale… +* Fernanda, the feminist activist: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/fer… +* Fatima, the censored user: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/fat… +* Alex, the fearless journalist: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/ale…

1 0

[community/staging] add language code to name
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 019057118172f0b465c7c171157ada315aa9bfca Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 27 08:03:45 2021 +0100 add language code to name --- databags/alternatives.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index f2a0d37..774371b 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -8,4 +8,4 @@ language = English (en) direction = text-left order = order-last url = /es/ -language = Español +language = Español (es)

1 0

[community/staging] fix rtl page and card layout. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/186
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 58f381e789e9611115e3a3113b860b07c156484a Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 27 07:57:52 2021 +0100 fix rtl page and card layout. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/186 --- templates/homepage.html | 9 +++++---- templates/layout.html | 3 ++- templates/two-columns-page.html | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index d01c9ff..361ac35 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,4 +1,5 @@ -<!doctype html> +<!doctype html>{% set locale = bag('alternatives', this.alt) %} +<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if locale.direction == 'text-right' %}dir="rtl"{% endif %}> {% include 'meta.html' %} <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> @@ -8,19 +9,19 @@ </header> <div class="page"> <div class="container-fluid bg-{{ this.color }}"> - <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> + <div class="row flex-xl-nowrap {{ locale.direction }}"> {% include 'hero.html' %} </div> </div> <div class="container-fluid"> <div class="row flex-xl-nowrap"> - <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> + <main role="main" class="mx-auto col-12 {{ locale.direction }}"> {% include this.html %} </main> </div> </div> <div class="container"> - <div class="row p-5 m-3 border"> + <div class="row p-5 m-3 border {{ locale.direction }}"> <p> {{ _('The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate.') }} Read our <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a> and learn about the <a href="https://gitweb.torproject.org/community/policies.git/tree/community_council…" title="Tor Commmunity Council" target="_blank">Tor Community Council</a>. </p> diff --git a/templates/layout.html b/templates/layout.html index 663c51b..e036c02 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,4 +1,5 @@ <!doctype html> +<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> {% include 'meta.html' %} <body class="no-gutters"> <header> @@ -9,7 +10,7 @@ {% include 'pagenav.html' %} <div class="container-fluid"> <div class="row flex-xl-nowrap"> - <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> + <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'direction') }}"> {% include this.html %} </main> </div> diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 1b4883a..d71e970 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -2,7 +2,7 @@ <div class="row"> {% include 'sidenav.html' %} - <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mt-5 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> + <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mt-5 mr-auto {{ bag('alternatives', this.alt, 'direction') }}"> <div class="col-10"> {{ this.body }} </div>

1 0

[community/staging] link anchor to "featured .onion site" section
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 670f7cbb549417fde358a4681154c7c64510426b Author: himandrisharma27 <himandrisharma27(a)gmail.com> Date: Sat Mar 27 09:45:11 2021 +0000 link anchor to "featured .onion site" section --- templates/onion-services.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/onion-services.html b/templates/onion-services.html index a42891a..603d459 100644 --- a/templates/onion-services.html +++ b/templates/onion-services.html @@ -32,7 +32,7 @@ {{ _('Check out the code') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> </a> </div> - <div class="row py-5 text-center mx-auto"> + <div id="featured-onions" class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Featured .onion sites') }}</h2> </div> <div class="row mx-auto">

1 0

[community/staging] make translated strings appear in homepage. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/172
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit e56b1fbda7331243e9481e4d8faee8624d945d5d Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 27 07:52:33 2021 +0100 make translated strings appear in homepage. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/172 --- templates/home.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/home.html b/templates/home.html index 2ceb15e..09449f0 100644 --- a/templates/home.html +++ b/templates/home.html @@ -11,13 +11,13 @@ <div class="col-lg-4 col-md-6 col-sm-12 py-4"> <div class="card h-100 p-2"> <div class="card-body"> - <h2 class="card-title ">{{ child.title }}</h2> - <p class="card-text">{{ child.subtitle }}</p> + <h2 class="card-title ">{{ _(child.title) }}</h2> + <p class="card-text">{{ _(child.subtitle) }}</p> <div class="illo-container"> - <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ child.section }}" /> + <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ _(child.section) }}" /> </div> </div> - <a href="{{ child.path|url }}" class="btn btn-primary">{{ child.cta }}</a> + <a href="{{ child.path|url }}" class="btn btn-primary">{{ _(child.cta) }}</a> </div> </div> {% endfor %}

1 0