tor-commits August 2020

tor-commits@lists.torproject.org

18 participants
1961 discussions

[tpo/staging] Update to script in line
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit d256ef6d44dc6bbef07c239ce36b35241594574c Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 01:23:04 2019 +0200 Update to script in line --- .../static/js/download.js | 10 +++++--- templates/footer.html | 29 +++------------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/templates/script-download.html b/assets/static/js/download.js similarity index 55% rename from templates/script-download.html rename to assets/static/js/download.js index cb341ece..8ce76255 100644 --- a/templates/script-download.html +++ b/assets/static/js/download.js @@ -1,14 +1,16 @@ -<script> $(".downloadLink").click( function(e) { e.preventDefault(); + locale = window.location.href.split('/')[3]; //open download link in new page window.open( $(this).attr("href") ); - + url = "/thank-you/" //redirect current page to success page - window.location="{{ '/thank-you'|url(alt=this.alt) }}"; + if (locale != "download") { + url = "/" + locale + url + } + window.location=url; window.focus(); } ); -</script> diff --git a/templates/footer.html b/templates/footer.html index 58212953..6155b089 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -75,30 +75,7 @@ <script src="{{ '/static/js/popper.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/bootstrap.bundle.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script> - <script type="text/javascript"> - - $('.side-nav').click(function(){ - if ($('.side-nav.active').length > 0) { - $('.side-nav.active').removeClass('active') - } - $(this).addClass('active'); - }); - - if($('.show').length !== 1 ) { - $('.show').collapse(); - } - - // Coming from search result page click - if(window.location.hash !== "") { - // Somehow collapse is not working sync and calling show directly after - // yields no effect and there is no callback when it is ready - setTimeout(() => { - // Folds out the answer manually - $(window.location.hash).collapse('show') - // Avoids the answer being hidden by the floating header - window.scrollTo(0, $(window.location.hash).position().top) - }, 500) - } - </script> - {% include 'script-download.html' %} + <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> + <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> + <script src="{{ '/static/js/download.js'|asseturl }}" ></script> </div>

1 0

[tpo/staging] add the other langs
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 69d7b6132b329e3c0f3dabb89df5958388d222e4 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Apr 6 19:13:49 2019 +0200 add the other langs --- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 ++++++ tpo.lektorproject | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 482b129c..c62ca581 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = de,es,fr,it,pt-BR,ru,tr +translations = bn,da,de,es,fr,id,is,it,ka,ko,pt-BR,ru,tr,zh-CN i18npath = i18n translate_paragraphwise = False url_prefix = https://www.torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index dc49ed22..08ed5a58 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -81,3 +81,9 @@ direction = text-left order = order-last url = /tr/ language = Türkçe (tr) + +[zh-CN] +direction = text-left +order = order-last +url = /zh-CN/ +language = 简体字 (zh-CN) diff --git a/tpo.lektorproject b/tpo.lektorproject index e2663098..a7fbe120 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -10,6 +10,16 @@ primary = yes url_prefix = / locale = en +[alternatives.bn] +name = বাংলা ভাষা (bn) +url_prefix = /bn/ +locale = bn + +[alternatives.da] +name = Dansk (da) +url_prefix = /da/ +locale = da + [alternatives.de] name = Deutsch (de) url_prefix = /de/ @@ -25,11 +35,31 @@ name = Français (fr) url_prefix = /fr/ locale = fr +[alternatives.id] +name = Indonesia (id) +url_prefix = /id/ +locale = id + +[alternatives.is] +name = Íslenska (is) +url_prefix = /is/ +locale = is + [alternatives.it] name = Italiano (it) url_prefix = /it/ locale = it +[alternatives.ka] +name = Georgian (ka) +url_prefix = /ka/ +locale = ka + +[alternatives.ko] +name = 한국어 (ko) +url_prefix = /ko/ +locale = ko + [alternatives.pt-BR] name = Português Brasil (pt-BR) url_prefix = /pt-BR/ @@ -44,3 +74,8 @@ locale = ru name = Türkçe (tr) url_prefix = /tr/ locale = tr + +[alternatives.zh-CN] +name = 简体字 (zh-CN) +url_prefix = /zh-CN/ +locale = zh-CN

1 0

[tpo/staging] add Arabic language
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit aff3fdfdf45435e1a47f7539480fb81483b8bb9e Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 12 10:00:33 2019 +0200 add Arabic language --- databags/about+ar.ini | 1 + databags/alternatives.ini | 6 ++++++ databags/menu+ar.ini | 19 +++++++++++++++++++ databags/menu_footer+ar.ini | 1 + tpo.lektorproject | 5 +++++ 5 files changed, 32 insertions(+) diff --git a/databags/about+ar.ini b/databags/about+ar.ini new file mode 120000 index 00000000..234b9482 --- /dev/null +++ b/databags/about+ar.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 08ed5a58..7d0f4790 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,6 +4,12 @@ order = order-last url = / language = English (en) +[ar] +direction = text-right +order = order-first +url = /ar/ +language = عربية (ar) + [bn] direction = text-left order = order-last diff --git a/databags/menu+ar.ini b/databags/menu+ar.ini new file mode 100644 index 00000000..d77e3469 --- /dev/null +++ b/databags/menu+ar.ini @@ -0,0 +1,19 @@ +[about] +path = /about/history +label = About + +[documentation] +path = https://2019.www.torproject.org/docs/documentation.html.en +label = Documentation + +[support] +path = https://support.torproject.org/ +label = Support + +[blog] +path = https://blog.torproject.org +label = Blog + +[donate] +path = https://donate.torproject.org +label = Donate diff --git a/databags/menu_footer+ar.ini b/databags/menu_footer+ar.ini new file mode 120000 index 00000000..a3178a1b --- /dev/null +++ b/databags/menu_footer+ar.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/tpo.lektorproject b/tpo.lektorproject index a7fbe120..e1bacb01 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -10,6 +10,11 @@ primary = yes url_prefix = / locale = en +[alternatives.ar] +name = عربية (ar) +url_prefix = /ar/ +locale = ar + [alternatives.bn] name = বাংলা ভাষা (bn) url_prefix = /bn/

1 0

[tpo/staging] this file is needed to allow translation of databags labels (navbar)
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 735cbdc9f83a91c80f53dc469dca8f8ecae7a6bc Author: emma peel <emma.peel(a)riseup.net> Date: Wed Apr 24 14:59:32 2019 +0200 this file is needed to allow translation of databags labels (navbar) --- content/menu/contents.lr | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/content/menu/contents.lr b/content/menu/contents.lr new file mode 100644 index 00000000..34edc58d --- /dev/null +++ b/content/menu/contents.lr @@ -0,0 +1,16 @@ +_template: about.html +--- +section: About +--- +color: primary +--- +title: About +--- +body: + +Documentation +Press +Support +Jobs +Blog +Donate

1 0

[tpo/staging] Fix download link in spanish
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit bc1cf651159af0fea52dcc333a7549341b701c12 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 23 10:12:03 2019 +0200 Fix download link in spanish --- templates/macros/downloads.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 6bddbb0f..742e1150 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -2,6 +2,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link_64 = download_prefix + 'torbrowser-install-win64-' + version + '_' + alt + '.exe' %} {% set download_link_32 = download_prefix + 'torbrowser-install-' + version + '_' + alt + '.exe' %} @@ -15,6 +17,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link = download_prefix + 'TorBrowser-' + version + '-osx64' + '_' + alt + '.dmg' %} {% set sig_link = download_link + '.asc' %} @@ -26,6 +30,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link_64 = download_prefix + 'tor-browser-linux64-' + version + '_' + alt + '.tar.xz' %} {% set download_link_32 = download_prefix + 'tor-browser-linux32-' + version + '_' + alt + '.tar.xz' %}

1 0

[tpo/staging] Add 8.5a11 to RecommendedTBBVersions
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit bf0c550220133715e72cbe638cfb7beaa306c28d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 16 21:35:53 2019 +0200 Add 8.5a11 to RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 0ab95b1e..4a5c3bad 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,5 +12,9 @@ body: "8.5a10", "8.5a10-MacOS", "8.5a10-Linux", -"8.5a10-Windows" +"8.5a10-Windows", +"8.5a11", +"8.5a11-MacOS", +"8.5a11-Linux", +"8.5a11-Windows" ]

1 0

[tpo/staging] Fix various typos
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit fbe8b77de66c1dc03e85d0a5854d4aaad45d6de1 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 19:21:46 2019 +0200 Fix various typos --- content/about/reports/2011-form-pc/contents.lr | 2 +- .../torbrowser/RecommendedTBBVersions/contents.lr | 15 +-------------- models/text.ini | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/content/about/reports/2011-form-pc/contents.lr b/content/about/reports/2011-form-pc/contents.lr index c9181efc..7d5b5415 100644 --- a/content/about/reports/2011-form-pc/contents.lr +++ b/content/about/reports/2011-form-pc/contents.lr @@ -6,7 +6,7 @@ date: 2011 --- tags: FISCAL YEAR --- -title: 2011 Steate of MA Form PC +title: 2011 State of MA Form PC --- _hidden: yes --- diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 4a5c3bad..56a3483e 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -4,17 +4,4 @@ _template: empty.html --- body: -[ -"8.0.8", -"8.0.8-MacOS", -"8.0.8-Linux", -"8.0.8-Windows", -"8.5a10", -"8.5a10-MacOS", -"8.5a10-Linux", -"8.5a10-Windows", -"8.5a11", -"8.5a11-MacOS", -"8.5a11-Linux", -"8.5a11-Windows" -] +["8.0.8", "8.0.8-MacOS", "8.0.8-Linux", "8.0.8-Windows", "8.5a10", "8.5a10-MacOS", "8.5a10-Linux", "8.5a10-Windows"] diff --git a/models/text.ini b/models/text.ini index 75e24ba5..3d575095 100644 --- a/models/text.ini +++ b/models/text.ini @@ -4,4 +4,4 @@ label = Text [fields.body] label = Body -type = text +type = html

1 0

[tpo/staging] Add Tor Browser 8.5a11
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit fa47c502ea52cfe1b8815f7d02f2af71b1afa481 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 17 01:00:07 2019 +0200 Add Tor Browser 8.5a11 --- databags/versions.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index cbba14e7..a2edc28e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -4,8 +4,8 @@ release_date = 2019-03-23 win32 = 0.3.5.8 [torbrowser-alpha] -version = 8.5a10 -release_date = 2019-03-25 +version = 8.5a11 +release_date = 2019-04-17 [torbrowser-develop-branch] version = maint-8.0

1 0

[tpo/staging] add pronoun pospeselr after irc chat
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 9ccfdceabed372b00d65e8908754371a6cbdb3a9 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 21:28:35 2019 +0100 add pronoun pospeselr after irc chat --- content/about/people/pospeselr/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/about/people/pospeselr/contents.lr b/content/about/people/pospeselr/contents.lr index 0679653a..8a86c5ca 100644 --- a/content/about/people/pospeselr/contents.lr +++ b/content/about/people/pospeselr/contents.lr @@ -6,6 +6,8 @@ name: Richard Pospesel --- nickname: pospeselr --- +pronoun: they/them +--- twitter_handle: pospeselr --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=BE7C914CC922CED9D93D23B7…

1 0

[tpo/staging] pronouns found on previous peoples page
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit a6ab243f1ed5eeded2648817d21899343e9b4912 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 27 09:18:51 2019 +0100 pronouns found on previous peoples page --- content/about/people/boklm/contents.lr | 2 ++ content/about/people/ewyatt/contents.lr | 2 ++ content/about/people/sajolida/contents.lr | 2 ++ 3 files changed, 6 insertions(+) diff --git a/content/about/people/boklm/contents.lr b/content/about/people/boklm/contents.lr index 46cd1d2b..a3051a2f 100644 --- a/content/about/people/boklm/contents.lr +++ b/content/about/people/boklm/contents.lr @@ -6,6 +6,8 @@ name: Nicolas Vigier --- nickname: boklm --- +pronoun: he +--- gpg: https://www.torproject.org/images/pgp-key.png --- description: diff --git a/content/about/people/ewyatt/contents.lr b/content/about/people/ewyatt/contents.lr index 69842bd3..339853a5 100644 --- a/content/about/people/ewyatt/contents.lr +++ b/content/about/people/ewyatt/contents.lr @@ -6,6 +6,8 @@ name: Erin Wyatt --- nickname: ewyatt --- +pronoun: she +--- gpg: /static/keys/ewyatt.txt --- image: /static/images/people/ewyatt.png diff --git a/content/about/people/sajolida/contents.lr b/content/about/people/sajolida/contents.lr index 21d9f48d..0839e7cf 100644 --- a/content/about/people/sajolida/contents.lr +++ b/content/about/people/sajolida/contents.lr @@ -6,6 +6,8 @@ name: sajolida --- nickname: sajolida --- +pronoun: he +--- gpg: /static/keys/sajolida.txt --- image: /static/images/people/sajolida.png

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2020