August 2020 - tor-commits - lists.torproject.org

[tpo/staging] add zh-TW website translation
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit a2ea232654b0920b07b560d7d82d8680972660dc Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 13:25:37 2019 +0100 add zh-TW website translation --- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 ++++++ tpo.lektorproject | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 6647fc68..d120302b 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = ar,bn,ca,da,de,es,fr,he,hu,id,is,it,ja,ka,ko,ms,nl,pl,pt-BR,pt-PT,ro,ru,th,tr,zh-CN +translations = ar,bn,ca,da,de,es,fr,he,hu,id,is,it,ja,ka,ko,ms,nl,pl,pt-BR,pt-PT,ro,ru,th,tr,zh-CN,zh-TW i18npath = i18n translate_paragraphwise = False url_prefix = https://www.torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index b7c88aa0..9f30f70f 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -153,3 +153,9 @@ direction = text-left order = order-last url = /zh-CN/ language = 简体中文 (zh-CN) + +[zh-TW] +direction = text-left +order = order-last +url = /zh-TW/ +language = 正體字 (zh-TW) diff --git a/tpo.lektorproject b/tpo.lektorproject index 463643e7..ee2585ac 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -134,3 +134,8 @@ locale = tr name = 简体中文 (zh-CN) url_prefix = /zh-CN/ locale = zh-CN + +[alternatives.zh-TW] +name = 正體字 (zh-TW) +url_prefix = /zh-TW/ +locale = zh-TW

1 0

[tpo/staging] Modify homepage to account for ltr locales
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit c280adbe4e53fc7feddebec89e2d56d5217787c6 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:57:05 2019 +0100 Modify homepage to account for ltr locales --- lego | 2 +- templates/homepage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lego b/lego index 3409e3ee..f9f15918 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3409e3eebc2ffca079bf890b5ecb5add6fceccbc +Subproject commit f9f1591892c374ae037f442dad78e366abed4364 diff --git a/templates/homepage.html b/templates/homepage.html index 52e41a21..4eb22bec 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -11,7 +11,7 @@ <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> {% include this.html %} {% if this.parent.path != "/download" %} - <div class="container pt-5 hero"> + <div class="container pt-5 hero {{ locale.order }} {{ locale.direction }}"> {% block body %}{% endblock %} </div> {% endif %}

1 0

[tpo/staging] Merge commit '39e050aeaeb811bd24de210a157bb6b49ad4c6bd' into staging
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit cf8d58f7b77491070074f3b6e274640980c43e68 Merge: e723575a 39e050ae Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:48:28 2019 +0100 Merge commit '39e050aeaeb811bd24de210a157bb6b49ad4c6bd' into staging templates/homepage.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tpo/staging] Update lego
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit c243a018eb06bcf160ff6cda824bba52f94f1ac4 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:32:05 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7c0e9ee4..d892ab18 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7c0e9ee42a4cdef87ebb8eefa7dde2df89403c94 +Subproject commit d892ab188dbc30f5827c93fc851506e383b48715

1 0

[tpo/staging] Merge commit 'c280adbe4e53fc7feddebec89e2d56d5217787c6' into staging
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit f8c448b20a7dfdd036c526a21325b59ef8456c3a Merge: cf8d58f7 c280adbe Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:57:55 2019 +0100 Merge commit 'c280adbe4e53fc7feddebec89e2d56d5217787c6' into staging lego | 2 +- templates/homepage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tpo/staging] Merge commit '7c2839d2c8bd959f9619878631d1d9ebe7b522ef' into staging
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit be106d457b841bbdf8a651ec76e3363c894aa8a8 Merge: f8c448b2 7c2839d2 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:17:00 2019 +0100 Merge commit '7c2839d2c8bd959f9619878631d1d9ebe7b522ef' into staging assets/static/images/people/acute.png | Bin 0 -> 43888 bytes assets/static/images/people/orig/acute.jpg | Bin 0 -> 33472 bytes content/about/people/acute/contents.lr | 19 +++++++++++++++++++ lego | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-)

1 0

[tpo/staging] Update download.html
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 4d29cfb29567f5ff3eea78992e6068f5fc24801a Author: Antonela <hola(a)antonela.me> Date: Thu Dec 5 15:14:50 2019 -0300 Update download.html I'm adding the minimal navbar and also a CTA to each platform. To-do: - replace the navbar for nav-min - fix the caps at the platforms name --- templates/hero-download.html | 22 +++++++++++++--------- templates/navbar-min.html | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index a13fb086..e142ecb0 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -7,7 +7,7 @@ <div class="row p-5 mx-auto"> {% for id, item in bag('platforms').items() %} <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> + <div class="oval-2 bg-darker"> {% set alt_l = alt %} {% set t = bag('versions', 'torbrowser-stable') %} {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %} @@ -29,23 +29,27 @@ <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <p><small class="float-left"><a class="btn btn-primary btn-sm nick mx-5 my-4" href="{{ sig_link }}">sig</a></small></p> + <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ id }}</a> + <a class="link" href="{{ sig_link }}"><span class="nick text-white">{{ _('Signature') }}</span></a> </div> </div> - {% endfor %} - <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> - <a href="#android"> - <i class="text-light fab fa-android-png"></i> - </a> + {% endfor %} + <div class="col-sm-6 col-md-3 py-3"> + <div class="oval-2 bg-darker mx-auto"> + <a href="#android"> + <i class="text-light fab fa-android-png"></i> + </a> + <a class="btn btn-primary mt-4" href="#android">{{ _('Download for Android') }}</a> + </div> </div> - </div> </div> + <div class="row p-5"> <a class="mx-auto text-white py-3 text-center" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Download the latest alpha build') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </div> + <div class="hidden-sm row p-md-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> </div> diff --git a/templates/navbar-min.html b/templates/navbar-min.html new file mode 100644 index 00000000..f9d2bc77 --- /dev/null +++ b/templates/navbar-min.html @@ -0,0 +1,19 @@ +{% if not this.color %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% elif this.color == 'primary' %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% else %} +<div class="container-fluid bg-dark"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2"> +{% endif %} + + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> + + </div> + </nav> +</div>

1 0

[tpo/staging] Add .htaccess-membership to add http auth to /about/membership
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit ae36d114f8a919c1b4e418dd1d447898c5258a09 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 18:10:29 2020 +0200 Add .htaccess-membership to add http auth to /about/membership --- .htaccess-membership | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.htaccess-membership b/.htaccess-membership new file mode 100644 index 00000000..64537967 --- /dev/null +++ b/.htaccess-membership @@ -0,0 +1,4 @@ +AuthType Basic + AuthName "Secure Content" + AuthUserFile .htpasswd + require valid-user

1 0

[tpo/staging] Merge branch 'staging'
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 7966c0d197d74c7f5da1f30077a90e5e826b3391 Merge: ae36d114 84975216 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 21:00:25 2020 +0200 Merge branch 'staging' templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] Update membership.html - CC copy
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit a4562adaf8f0d59f80a053288550c37342b489d6 Author: Antonela <antonela(a)torproject.org> Date: Mon Jul 27 19:22:47 2020 +0000 Update membership.html - CC copy --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index 6d915086..32deccc5 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -42,7 +42,7 @@ <div class="container"> <div class="row p-5 my-5 border text-center"> <p> - Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's 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>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. + Community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to Tor’s <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>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. </p> </div> </div>

1 0