commit 4e9f839171008e8dc2db485dc689dcd26808fe01 Author: emma peel <emma.peel@riseup.net> Date: Wed Mar 17 14:04:42 2021 +0100 remove preview languages, otherwise you cannot test --- .gitmodules | 1 + .htaccess | 19 +++++++++++++++++++ README.md | 53 ++++++++++++++++++++++++++--------------------------- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/.gitmodules b/.gitmodules index d246c46..e8f1eb4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "lego"] path = lego url = https://git.torproject.org/project/web/lego.git + branch = master diff --git a/.htaccess b/.htaccess index 6e2c53a..288fe03 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,23 @@ +RewriteEngine On + # forward requests in /en to the root folder RewriteRule ^(en-US|en)$ / [R=302,L] RewriteRule ^(en-US|en)/(.*) /$2 [R=302,L] +# forward requests in /en and /en-US to the root folder +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] + +# we have only one translation for this locales +RewriteRule ^(bn-BD|bn-IN)(.*) /bn$2 [R=302,L] +RewriteRule ^ga-IE/(.*) /ga$1 [R=302,L] + +# Rewrites for languages that have a Tor Browser release +# but don't have a community page +# You can see them at https://dist.torproject.org/torbrowser/, pick the last alpha for the most languages +# this languages are the translation priority for the community portal! +RewriteRule ^(da|ga|hu|ko|lt|mk|ms|nb-NO|nl|pl|sv-SE|th|vi|zh-TW)$ / [R=302,L] +RewriteRule ^(da|ga|hu|ko|lt|mk|ms|nb-NO|nl|pl|sv-SE|th|vi|zh-TW)/(.*) /$2 [R=302,L] diff --git a/README.md b/README.md index b7dee2b..d0d917a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/community.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +First check if your issue wasn't already opened in [gitlab.torproject.org](https://gitlab.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. ## What is Lektor @@ -39,11 +39,11 @@ You can click ```Edit this page``` and submit your content changes in a [Pull Re 4. Init the building blocks submodule: -```$ cd lego && git submodule update --init --recursive``` +```$ cd community/lego && git submodule update --init --recursive``` -5. Translations for the website are imported by Jenkins when bulding the page, but if you want to test them, download the correct branch of the translations repo to the ./i18n/ folder. +5. Translations for the website are imported by Jenkins when building the page, but if you want to test them, download the correct branch of the translations repo to the ./i18n/ folder. -6. Finally +6. Finally: To run a local continuous builder: ```$ lektor server``` @@ -51,13 +51,12 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the-website). +Check our [wiki pages](https://gitlab.torproject.org/web/community/wikis/How-to-develop-on-the-webs...). ### Translations To help us to translate, please join the Tor Project team in [Transifex](https://www.transifex.com/). - ### 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). @@ -68,31 +67,31 @@ If you want to contribute to the Community portal, we will be happy to help you. 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-...) to work on your changes. -2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version-of-the-we...) -3. Once you are happy with your work, push your changes to `develop` 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 `develop` branch, e.g https://lektor-staging.torproject.org/community/develop/ - - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr` - - For the review workflow, please see (Reviewer Workflow) -5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick 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#how-to-...) -6. Merger should then move the the ticket to the `Closed` column. +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://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-...) to work on your changes. +2. To view your changes on the website, you can [run lektor locally](https://gitlab.torproject.org/web/tpo/wikis/Compiling-a-local-version-of-the...). +3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://gitlab.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 `develop` branch, e.g. https://lektor-staging.torproject.org/community/develop/. + - Contents file, containing your changes where it would be located on the **reviewer's repo**, e.g. `https://gitlab.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr`. + - For the review workflow, please see (Reviewer Workflow). +5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-...). +6. Merger should then move the ticket to the `Closed` column. ### Reviewer Workflow -1. Review the page on lektor-staging +1. Review the page on lektor-staging. 2. Review the content on your repo's develop branch and use the gitlab edit button to make any changes. 3. When you are happy with your changes: - - Update the "Commit message" to explain why you have made your changes - - Update the "Target Branch" + - Update the "Commit message" to explain why you have made your changes. + - Update the "Target Branch". - Make sure that the "Start a new merge request with these changes" checkbox is checked. - - Click on "Commit changes" + - Click on "Commit changes". 4. You will be sent to a new page to create your merge request: - - Update "Title" with a short title to explain your changes - - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/community/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged + - Update "Title" with a short title to explain your changes. + - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g. `https://gitlab.torproject.org/web/community/issues/3`, and tagging one of the repo maintainers, e.g. `@pili`, so they know the change can be merged. - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. - - Click "Submit merge request" -5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/community/merge_requests/2` + - Click "Submit merge request". +5. Reviewer should comment on the original issue with a link to the merge request created, e.g. `https://gitlab.torproject.org/steph/community/merge_requests/2`. ### Volunteer Workflow @@ -100,13 +99,13 @@ This is the workflow that external volunteers should use when making changes on 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 review +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 review. 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 `develop` branch for functionality review + - 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 `develop` 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.