October 2019 - tor-commits - lists.torproject.org

[community/develop] Merge remote-tracking branch 'nick/master'
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 80c7169ad5bfa08b45e27a2c5bdf3f92d2cc5bb3 Merge: 315fcc6 fd08625 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Sep 17 09:13:06 2019 -0700 Merge remote-tracking branch 'nick/master' .../technical-setup/bridge/openbsd/contents.lr | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)

1 0

[community/develop] Update Docker container version to 0.2.
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 315fcc6bd4d2b6607d8a8b441ddd8036411af110 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 14:06:39 2019 -0700 Update Docker container version to 0.2. --- content/relay-operations/technical-setup/bridge/docker/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index ef601f1..bf5f5b1 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -8,7 +8,7 @@ body: We are maintaining a docker container that allows you to quickly set up an obfs4 bridge. First, fetch the container: -`docker pull phwinter/obfs4-bridge:0.1` +`docker pull phwinter/obfs4-bridge:0.2` Now, it's time to run the container. We maintain a script that automatically determines a free OR and obfs4 port for you. The script only requires your email address as argument: ```

1 0

[community/develop] Update README with our workflow
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 10d21d7d6bba9b919b2baf84e3d86e8f2c0e609f Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Sep 18 22:03:33 2019 +0200 Update README with our workflow --- README.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/README.md b/README.md index d543c35..cf1d9de 100644 --- a/README.md +++ b/README.md @@ -61,3 +61,38 @@ To help us to translate, please join the Tor Project team in [Transifex](https:/ ### Getting help If you want to contribute to the Community portal, we will be happy to help you. Join us at #tor-www in [irc.oftc.net](https://www.oftc.net). + +## Our Workflows + +### Internal Workflow + +This is the workflow that Tor Internal people should use when making changes on the Community Portal: + +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. +2. To view your changes on the website, you can either run lektor locally, or push to `develop` branch. +3. Once you are happy with your work, push your changes to `staging` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) +4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: + - Location of page on lektor staging, e.g https://lektor-staging.torproject.org/community/staging/ + - Contents file, on your branch, containing your changes, e.g https://dip.torproject.org/pili/community/blob/master/content/onion-service… + - For the review workflow, please see +5. Once the work has been reviewed and any necessary changes have been made, reviewer should move the issue to the `reviewed` column and add a comment to the issue with details of where the latest version can be found, e.g https://dip.torproject.org/{user}/community/blob/master/content/onion-servi… +6. Team members with write access to gitweb master will then push these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… +7. Merger should then move the the ticket to the `Closed` column + +### Volunteer Workflow + +This is the workflow that external volunteers should use when making changes on the Community Portal: + +We recommend that you use our [github mirror](https://github.com/torproject/community) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: + +0. Ideally try to run it locally and check that nothing breaks and everything still behaves as before +1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for reviewx + +At this point, one of us on the website team will aim to review your PR within 24h during the week (this may take longer on the weekends). Review will involve: + + - Reading the text to make sure it's accurate and there are no spelling errors or grammar mistakes + - If there are any front end and/or template changes involved, the changes will be pushed to our development branch for functionality review + - If there are any fixes necessary, we will ask for changes to be made. + +Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master. +

1 0

[community/develop] Fix template hero spacing
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 315f634e7bf8c0ca58ad99d7ba48f5207447b701 Author: hiro <hiro(a)torproject.org> Date: Wed Sep 18 12:29:54 2019 +0200 Fix template hero spacing --- lego | 2 +- templates/hero.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lego b/lego index 8cb5f20..09c5813 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8cb5f20089a163b0a5134d841248778cb518bdf2 +Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 diff --git a/templates/hero.html b/templates/hero.html index 4b096aa..3a8f7c0 100644 --- a/templates/hero.html +++ b/templates/hero.html @@ -2,7 +2,7 @@ <div class="row"> <div class="col-12 content-center"> <div class="row"> - <h6 class="mx-auto text-white">{% block section %}{{ this.section }}{% endblock %}</h6> + <h6 class="mx-auto text-white pt-3">{% block section %}{{ this.section }}{% endblock %}</h6> </div> <div class="row"> <h2 class="mx-auto display-3 text-white">{% block title %}{{ this.title }}{% endblock %}</h2>

1 0

[community/develop] FlowAndGrammarEdit.lr
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 929778fb1e80405ebdf7e74c40d35d567e6d2d77 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Thu Sep 19 15:51:08 2019 +0000 FlowAndGrammarEdit.lr --- content/localization/current-status/contents.lr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/localization/current-status/contents.lr b/content/localization/current-status/contents.lr index 1f539df..e9131f6 100644 --- a/content/localization/current-status/contents.lr +++ b/content/localization/current-status/contents.lr @@ -16,14 +16,14 @@ html: two-columns-page.html --- body: -We have some languages in very good shape, with a number of active and committed contributors (as French, Spanish, Russian, Portuguese). Even when the translations are finished, we always welcome more contributors to this languages. +We have some languages in very good shape, with a number of active and committed contributors (as French, Spanish, Russian, Portuguese). Even when the translations are finished, you are still welcome to help us with these languages. -We also have a lot of languages with incomplete translations, maybe spoken by less numbers of people, but still important to improve access to the Tor network for people that does not speak English. +Our translations are incomplete for a lot of languages. They may be spoken by fewer people around the world, but it is still critical that we improve access to Tor for people who do not speak English. -We are committed to provide translations to more languagues, please consider [helping with translations](/localization/becoming-tor-translator/) to your native language. +Please consider [helping with translations](/localization/becoming-tor-translator/) in your native language. -The most important languages we need help with at the moment are: Farsi (Persian), Arabic and Korean. But many other languages are being translated, as you can see here: +Right now, we need the most help with Farsi (Persian), Arabic, and Korean. But many other languages are being translated, as you can see here: <img class="col-lg-6" src="../../static/images/localization/stats.png"> -You can also see the open tickets about translation problems on our [bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed&c…. +You can see the open tickets about translation problems on our [bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed&c….

1 0

[community/develop] Editflowandgrammar.lr
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit f96b32d918d75b76c86723ae7b38e7bd49eae6ed Author: Stephanie A. Whited <steph(a)torproject.org> Date: Thu Sep 19 16:17:56 2019 +0000 Editflowandgrammar.lr --- content/localization/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/localization/contents.lr b/content/localization/contents.lr index ccdc74d..e356bc4 100644 --- a/content/localization/contents.lr +++ b/content/localization/contents.lr @@ -8,9 +8,9 @@ _template: layout.html --- title: Localization --- -subtitle: We want Tor to work for everyone in the world, which means a lot of languages. +subtitle: We want Tor to work for everyone in the world, which means our software must be translated into a lot of languages. --- -cta: Help us to translate +cta: Help us translate --- key: 2 --- @@ -22,4 +22,4 @@ body: In order for Tor to work for everyone, it needs to speak everyone's languages. Our volunteer translation team works hard to make this a reality, and we can always use more help. -Our current translation priorities are translating the [Tor Browser](https://torpat.ch/locales), its documentation and the [Tor Project website](https://torpat.ch/tpo-locales), and there are always other documents to translate. +Our current translation priorities are translating [Tor Browser](https://torpat.ch/locales), Tor Browser documentation, and the [Tor Project website](https://torpat.ch/tpo-locales), but there are many other documents that we could use help translating as well.

1 0

[community/develop] trailing space
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 6c4d1aba92d23a88ee60bca1490954bed1206203 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 19 18:49:39 2019 +0200 trailing space --- content/onion-services/overview/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index 869db5e..c85306f 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -20,7 +20,7 @@ Onion services are services that can only be accessed over Tor. Running an onion ## Why onion services? -Onion services offer various privacy and security benefits to their users. +Onion services offer various privacy and security benefits to their users. ### Location hiding

1 0

[community/develop] Improve Consistency
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit d556fe5afce4b2c24c8264f1db5ce1f6d2484ddf Author: Aadi Bajpai <me(a)aadibajpai.me> Date: Fri Sep 20 08:03:11 2019 +0530 Improve Consistency --- content/onion-services/setup/contents.lr | 4 ++-- databags/pagenav+en.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index 784cf45..a33df07 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -8,9 +8,9 @@ image: cloud-upload-alt --- _template: layout.html --- -title: Set up your .onion Service +title: Set up your Onion Service --- -subtitle: Learn how to set up a .onion of your very own. +subtitle: Learn how to set up a .onion site of your very own. --- key: 1 --- diff --git a/databags/pagenav+en.ini b/databags/pagenav+en.ini index cb5b415..7d03cec 100644 --- a/databags/pagenav+en.ini +++ b/databags/pagenav+en.ini @@ -16,4 +16,4 @@ label = Relay Operations [onion-services] path = onion-services -label = .Onion Services +label = Onion Services

1 0

[community/develop] Use Docker's 'latest' tag for up-to-date image.
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 2879ca75eb9411fe4060c2ed9503dcbba3b0d871 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 19 12:28:45 2019 -0700 Use Docker's 'latest' tag for up-to-date image. --- content/relay-operations/technical-setup/bridge/docker/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index bf5f5b1..f82a65e 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -8,7 +8,7 @@ body: We are maintaining a docker container that allows you to quickly set up an obfs4 bridge. First, fetch the container: -`docker pull phwinter/obfs4-bridge:0.2` +`docker pull phwinter/obfs4-bridge:latest` Now, it's time to run the container. We maintain a script that automatically determines a free OR and obfs4 port for you. The script only requires your email address as argument: ```

1 0

[community/develop] Update contents.lr
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 35a5ad7d4bf2b651d314e50cbd0ff84cf398ace8 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Fri Sep 20 07:53:41 2019 +0000 Update contents.lr

1 0