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

[tpo/master] Use relative links in home button and locale
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 972734e87501f12e1c97bcf840fcce476be20035 Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 18:32:16 2019 +0100 Use relative links in home button and locale --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index d7e1844..9b708eb 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -5,7 +5,7 @@ <div class="container bg-dark"> <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-dark p-4"> {% endif %} - <a class="navbar-brand" href="/"> + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo.svg'|asseturl }}" > <span class="sr-only">Tor Logo</span> </a>

1 0

[tpo/staging] Add fixes and more
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit ce2c61656a372dee0e5554923ec7e0b3c52ca1fe Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 18:30:35 2019 +0100 Add fixes and more --- content/about/contents.lr | 4 ---- templates/download-android.html | 2 +- templates/footer.html | 4 ++-- templates/hero-download.html | 4 ++-- templates/hero-home.html | 2 +- templates/navbar.html | 10 +++++----- templates/pagenav.html | 2 +- templates/script-download.html | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) diff --git a/content/about/contents.lr b/content/about/contents.lr index a9cbf7c..e43c1a0 100644 --- a/content/about/contents.lr +++ b/content/about/contents.lr @@ -9,7 +9,3 @@ color: primary title: History --- body: - -The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of “onion routing” began in the mid 1990s. - -Just like Tor users, the developers, researchers, and funders who’ve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web. diff --git a/templates/download-android.html b/templates/download-android.html index 25fd83c..9630021 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -3,7 +3,7 @@ <div class="col-lg-8 py-5 mt-5"> <div class="row"> <div class="oval-2 bg-dark mx-auto"> - <a href="{{ '/download/#android'|url }}"> + <a href="{{ '/download/#android'|url(alt=this.alt) }}"> <i class="fab fa-android text-light" alt="android" ></i> </a> </div> diff --git a/templates/footer.html b/templates/footer.html index 4257132..5821295 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -9,7 +9,7 @@ <h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2> <p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p> {% set download = site.get('/download') %} - <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download)|url(alt=this.alt) }}"> + <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div> @@ -29,7 +29,7 @@ <li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %} {% if link %} - <a class="nav-link text-light" href="{{ item.path|url }}"> + <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> {% else %} <a class="nav-link text-light" href="{{ item.path }}"> {% endif %} diff --git a/templates/hero-download.html b/templates/hero-download.html index 41ef5d9..6dff1ad 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -35,8 +35,8 @@ </div> </div> <div class="row p-5"> - <a class="mx-auto text-white py-3" href="{{ 'languages'|url }}"><u>{{ _('Download in another language') }}</u></a> - <a class="mx-auto text-white py-3" href="{{ 'options'|url }}"><u>{{ _('Advanced Install Options') }}</u></a> + <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a> + <a class="mx-auto text-white py-3" href="{{ 'options'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> </div> <div class="hidden-sm row p-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> diff --git a/templates/hero-home.html b/templates/hero-home.html index 8bb8624..9d5d7de 100644 --- a/templates/hero-home.html +++ b/templates/hero-home.html @@ -9,7 +9,7 @@ </div> <div class="row col-12 p-5 mx-auto justify-content-center"> {% set download = site.get('/download') %} - <a class="btn btn-lg btn-outline-light" href="{{ this.url_to(download) }}"> + <a class="btn btn-lg btn-outline-light" href="{{ this.url_to(download, alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div> diff --git a/templates/navbar.html b/templates/navbar.html index 4ba1148..d7e1844 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -5,12 +5,12 @@ <div class="container bg-dark"> <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-dark p-4"> {% endif %} - <a class="navbar-brand col-sm-3 col-1" href="/"> + <a class="navbar-brand" href="/"> <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo.svg'|asseturl }}" > <span class="sr-only">Tor Logo</span> </a> <label for="nav-toggle"> - <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <a class="btn btn-lg btn-primary navbar-toggler text-white p-3 col-1" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> {{ _("Menu") }} <span class="navbar-toggler-icon ml-1"></span> </a> </label> @@ -23,7 +23,7 @@ <li{% if this.path == item.path %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %} {% if link %} - <a class="nav-link" href="{{ item.path|url }}"> + <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}"> {% else %} <a class="nav-link" href="{{ item.path }}"> {% endif %} @@ -36,7 +36,7 @@ {% endfor %} </ul> </div> - <div class="btn-group col-lg-2 col-12"> + <div class="btn-group pull-right"> {% if this.color == 'primary' %} <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% else %} @@ -53,7 +53,7 @@ </div> </div> {% set download = site.get('/download') %} - <div class="col-lg-2 col-12"> + <div class="pull-right"> <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> diff --git a/templates/pagenav.html b/templates/pagenav.html index 84e2794..1993909 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -6,7 +6,7 @@ {% for id, item in bag(menubag).items() %} <li{% if this.path == '/' + item.path %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}> {% set item_path = site.get(item.path) %} - <a class="nav-link" href="{{ this.url_to(item_path) }}">{{ _(item.label) }} + <a class="nav-link" href="{{ this.url_to(item_path, alt=this.alt) }}">{{ _(item.label) }} {% if this.path == '/' + item.path %} <span class="sr-only">(current)</span> {% endif %} diff --git a/templates/script-download.html b/templates/script-download.html index 51fcc08..cb341ec 100644 --- a/templates/script-download.html +++ b/templates/script-download.html @@ -7,7 +7,7 @@ $(".downloadLink").click( window.open( $(this).attr("href") ); //redirect current page to success page - window.location="{{ '/thank-you'|url }}"; + window.location="{{ '/thank-you'|url(alt=this.alt) }}"; window.focus(); } );

1 0

[tpo/master] Add fixes and more
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit ce2c61656a372dee0e5554923ec7e0b3c52ca1fe Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 18:30:35 2019 +0100 Add fixes and more --- content/about/contents.lr | 4 ---- templates/download-android.html | 2 +- templates/footer.html | 4 ++-- templates/hero-download.html | 4 ++-- templates/hero-home.html | 2 +- templates/navbar.html | 10 +++++----- templates/pagenav.html | 2 +- templates/script-download.html | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) diff --git a/content/about/contents.lr b/content/about/contents.lr index a9cbf7c..e43c1a0 100644 --- a/content/about/contents.lr +++ b/content/about/contents.lr @@ -9,7 +9,3 @@ color: primary title: History --- body: - -The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of “onion routing” began in the mid 1990s. - -Just like Tor users, the developers, researchers, and funders who’ve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web. diff --git a/templates/download-android.html b/templates/download-android.html index 25fd83c..9630021 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -3,7 +3,7 @@ <div class="col-lg-8 py-5 mt-5"> <div class="row"> <div class="oval-2 bg-dark mx-auto"> - <a href="{{ '/download/#android'|url }}"> + <a href="{{ '/download/#android'|url(alt=this.alt) }}"> <i class="fab fa-android text-light" alt="android" ></i> </a> </div> diff --git a/templates/footer.html b/templates/footer.html index 4257132..5821295 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -9,7 +9,7 @@ <h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2> <p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p> {% set download = site.get('/download') %} - <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download)|url(alt=this.alt) }}"> + <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div> @@ -29,7 +29,7 @@ <li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %} {% if link %} - <a class="nav-link text-light" href="{{ item.path|url }}"> + <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> {% else %} <a class="nav-link text-light" href="{{ item.path }}"> {% endif %} diff --git a/templates/hero-download.html b/templates/hero-download.html index 41ef5d9..6dff1ad 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -35,8 +35,8 @@ </div> </div> <div class="row p-5"> - <a class="mx-auto text-white py-3" href="{{ 'languages'|url }}"><u>{{ _('Download in another language') }}</u></a> - <a class="mx-auto text-white py-3" href="{{ 'options'|url }}"><u>{{ _('Advanced Install Options') }}</u></a> + <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a> + <a class="mx-auto text-white py-3" href="{{ 'options'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> </div> <div class="hidden-sm row p-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> diff --git a/templates/hero-home.html b/templates/hero-home.html index 8bb8624..9d5d7de 100644 --- a/templates/hero-home.html +++ b/templates/hero-home.html @@ -9,7 +9,7 @@ </div> <div class="row col-12 p-5 mx-auto justify-content-center"> {% set download = site.get('/download') %} - <a class="btn btn-lg btn-outline-light" href="{{ this.url_to(download) }}"> + <a class="btn btn-lg btn-outline-light" href="{{ this.url_to(download, alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div> diff --git a/templates/navbar.html b/templates/navbar.html index 4ba1148..d7e1844 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -5,12 +5,12 @@ <div class="container bg-dark"> <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-dark p-4"> {% endif %} - <a class="navbar-brand col-sm-3 col-1" href="/"> + <a class="navbar-brand" href="/"> <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo.svg'|asseturl }}" > <span class="sr-only">Tor Logo</span> </a> <label for="nav-toggle"> - <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <a class="btn btn-lg btn-primary navbar-toggler text-white p-3 col-1" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> {{ _("Menu") }} <span class="navbar-toggler-icon ml-1"></span> </a> </label> @@ -23,7 +23,7 @@ <li{% if this.path == item.path %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %} {% if link %} - <a class="nav-link" href="{{ item.path|url }}"> + <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}"> {% else %} <a class="nav-link" href="{{ item.path }}"> {% endif %} @@ -36,7 +36,7 @@ {% endfor %} </ul> </div> - <div class="btn-group col-lg-2 col-12"> + <div class="btn-group pull-right"> {% if this.color == 'primary' %} <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% else %} @@ -53,7 +53,7 @@ </div> </div> {% set download = site.get('/download') %} - <div class="col-lg-2 col-12"> + <div class="pull-right"> <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> diff --git a/templates/pagenav.html b/templates/pagenav.html index 84e2794..1993909 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -6,7 +6,7 @@ {% for id, item in bag(menubag).items() %} <li{% if this.path == '/' + item.path %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}> {% set item_path = site.get(item.path) %} - <a class="nav-link" href="{{ this.url_to(item_path) }}">{{ _(item.label) }} + <a class="nav-link" href="{{ this.url_to(item_path, alt=this.alt) }}">{{ _(item.label) }} {% if this.path == '/' + item.path %} <span class="sr-only">(current)</span> {% endif %} diff --git a/templates/script-download.html b/templates/script-download.html index 51fcc08..cb341ec 100644 --- a/templates/script-download.html +++ b/templates/script-download.html @@ -7,7 +7,7 @@ $(".downloadLink").click( window.open( $(this).attr("href") ); //redirect current page to success page - window.location="{{ '/thank-you'|url }}"; + window.location="{{ '/thank-you'|url(alt=this.alt) }}"; window.focus(); } );

1 0

[tpo/staging] Add metatags
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 640815f46b8dad323c4818e7fc2ce0188625a8e3 Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 17:56:23 2019 +0100 Add metatags --- templates/about.html | 8 +------- templates/homepage.html | 9 +-------- templates/layout.html | 9 +-------- templates/meta.html | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/templates/about.html b/templates/about.html index 4372ae2..8a6552c 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,10 +1,4 @@ -<!doctype html> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> +{% include 'meta.html' %} <body class="no-gutters"> <header> {% include 'navbar.html' %} diff --git a/templates/homepage.html b/templates/homepage.html index c1f4d2a..25ba0ba 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,11 +1,4 @@ -<!doctype html> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> - -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> +{% include 'meta.html' %} <body class="no-gutters"> <header> {% include 'navbar.html' %} diff --git a/templates/layout.html b/templates/layout.html index d7bfa42..db1168f 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,11 +1,4 @@ -<!doctype html> -<html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> +{% include 'meta.html' %} <body class="no-gutters"> <header> {% include 'navbar.html' %} diff --git a/templates/meta.html b/templates/meta.html new file mode 100644 index 0000000..714897e --- /dev/null +++ b/templates/meta.html @@ -0,0 +1,16 @@ +<!doctype html> +<html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<meta name="description" content="Defend yourself against tracking and surveillance. Circumvent censorship."> +<meta name="twitter:card" content="summary" /> +<meta name="twitter:site" content="@torproject" /> +<meta name="twitter:creator" content="@torproject" /> +<meta property="og:url" content="https://torproject.org" /> +<meta property="og:title" content="The Tor Project | Privacy & Freedom Online" /> +<meta property="og:description" content="Defend yourself against tracking and surveillance. Circumvent censorship." /> +<meta property="og:image" content="" /> +<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> +<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>

1 0

[tpo/master] Add metatags
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 640815f46b8dad323c4818e7fc2ce0188625a8e3 Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 17:56:23 2019 +0100 Add metatags --- templates/about.html | 8 +------- templates/homepage.html | 9 +-------- templates/layout.html | 9 +-------- templates/meta.html | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/templates/about.html b/templates/about.html index 4372ae2..8a6552c 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,10 +1,4 @@ -<!doctype html> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> +{% include 'meta.html' %} <body class="no-gutters"> <header> {% include 'navbar.html' %} diff --git a/templates/homepage.html b/templates/homepage.html index c1f4d2a..25ba0ba 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,11 +1,4 @@ -<!doctype html> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> - -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> +{% include 'meta.html' %} <body class="no-gutters"> <header> {% include 'navbar.html' %} diff --git a/templates/layout.html b/templates/layout.html index d7bfa42..db1168f 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,11 +1,4 @@ -<!doctype html> -<html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> +{% include 'meta.html' %} <body class="no-gutters"> <header> {% include 'navbar.html' %} diff --git a/templates/meta.html b/templates/meta.html new file mode 100644 index 0000000..714897e --- /dev/null +++ b/templates/meta.html @@ -0,0 +1,16 @@ +<!doctype html> +<html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<meta name="description" content="Defend yourself against tracking and surveillance. Circumvent censorship."> +<meta name="twitter:card" content="summary" /> +<meta name="twitter:site" content="@torproject" /> +<meta name="twitter:creator" content="@torproject" /> +<meta property="og:url" content="https://torproject.org" /> +<meta property="og:title" content="The Tor Project | Privacy & Freedom Online" /> +<meta property="og:description" content="Defend yourself against tracking and surveillance. Circumvent censorship." /> +<meta property="og:image" content="" /> +<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> +<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>

1 0

[tpo/staging] Create databag for alpha releases
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 02d22d538ec5cec8cb76df5f34bbe5a4a9b21b54 Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 17:40:37 2019 +0100 Create databag for alpha releases --- databags/download-alternatives-alpha.ini | 99 ++++++++++++++++++++++++++++++++ templates/download-options.html | 2 +- 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini new file mode 100644 index 0000000..2fdf984 --- /dev/null +++ b/databags/download-alternatives-alpha.ini @@ -0,0 +1,99 @@ +[en] +url = /en/ +language = English (en) + +[ar] +url = /ar/ +language = عربية (ar) + +[ca] +url = /ca/ +language = Catalá (ca) + +[da] +url = /da/ +language = Dansk (da) + +[de] +url = /de/ +language = Deutsch (de) + +[es-ES] +url = /es/ +language = Español (es) + +[fa] +url = /fa/ +language = Farsi (fa) + +[fr] +url = /fr/ +language = Français (fr) + +[ga] +url = /ga/ +language = Gaeilge (ga) + +[he] +url = /he/ +language = עברית (he) + +[id] +url = /id/ +language = Indonesia (id) + +[is] +url = /is/ +language = Islenska (is) + +[it] +url = /it/ +language = Italiano (it) + +[ja] +url = /ja/ +language = 日本語 (ja) + +[ko] +url = /ko/ +language = 한국어 (ko) + +[nb-NO] +url = /nb-NO/ +language = Norsk Bokmål (nb-NO) + +[nl] +url = /nl/ +language = Nederlands (nl) + +[pl] +url = /pl/ +language = Polszczyzna (pl) + +[pt-BR] +url = /pt-BR/ +language = Português Brasil(pt-BR) + +[ru] +language = Русский (ru) +url = /ru/ + +[sv] +url = /sv/ +language = Svenska (sv) + +[tr] +url = /tr/ +language = Türkçe (tr) + +[vi] +url = /vi/ +language = Tiếng Việt (vi) + +[zh-CN] +url = /zh-CN/ +language = 中文简 (zh-CN) + +[zh-TW] +url = /zh-TW/ +language = 正體字 (zh-TW) diff --git a/templates/download-options.html b/templates/download-options.html index 0634f0e..8698e73 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -16,7 +16,7 @@ </thead> <tbody> {% set t = bag('versions', 'torbrowser-alpha') %} - {% for id, item in bag('download-alternatives').items() %} + {% for id, item in bag('download-alternatives-alpha').items() %} <tr> <td>{{ item.language }}</td> <td>

1 0

[tpo/master] Create databag for alpha releases
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 02d22d538ec5cec8cb76df5f34bbe5a4a9b21b54 Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 17:40:37 2019 +0100 Create databag for alpha releases --- databags/download-alternatives-alpha.ini | 99 ++++++++++++++++++++++++++++++++ templates/download-options.html | 2 +- 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini new file mode 100644 index 0000000..2fdf984 --- /dev/null +++ b/databags/download-alternatives-alpha.ini @@ -0,0 +1,99 @@ +[en] +url = /en/ +language = English (en) + +[ar] +url = /ar/ +language = عربية (ar) + +[ca] +url = /ca/ +language = Catalá (ca) + +[da] +url = /da/ +language = Dansk (da) + +[de] +url = /de/ +language = Deutsch (de) + +[es-ES] +url = /es/ +language = Español (es) + +[fa] +url = /fa/ +language = Farsi (fa) + +[fr] +url = /fr/ +language = Français (fr) + +[ga] +url = /ga/ +language = Gaeilge (ga) + +[he] +url = /he/ +language = עברית (he) + +[id] +url = /id/ +language = Indonesia (id) + +[is] +url = /is/ +language = Islenska (is) + +[it] +url = /it/ +language = Italiano (it) + +[ja] +url = /ja/ +language = 日本語 (ja) + +[ko] +url = /ko/ +language = 한국어 (ko) + +[nb-NO] +url = /nb-NO/ +language = Norsk Bokmål (nb-NO) + +[nl] +url = /nl/ +language = Nederlands (nl) + +[pl] +url = /pl/ +language = Polszczyzna (pl) + +[pt-BR] +url = /pt-BR/ +language = Português Brasil(pt-BR) + +[ru] +language = Русский (ru) +url = /ru/ + +[sv] +url = /sv/ +language = Svenska (sv) + +[tr] +url = /tr/ +language = Türkçe (tr) + +[vi] +url = /vi/ +language = Tiếng Việt (vi) + +[zh-CN] +url = /zh-CN/ +language = 中文简 (zh-CN) + +[zh-TW] +url = /zh-TW/ +language = 正體字 (zh-TW) diff --git a/templates/download-options.html b/templates/download-options.html index 0634f0e..8698e73 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -16,7 +16,7 @@ </thead> <tbody> {% set t = bag('versions', 'torbrowser-alpha') %} - {% for id, item in bag('download-alternatives').items() %} + {% for id, item in bag('download-alternatives-alpha').items() %} <tr> <td>{{ item.language }}</td> <td>

1 0

[tpo/staging] Localize download link
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit cedcbdbe10e90791eed5e6e06ae55ac20f8baa5f Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 17:36:44 2019 +0100 Localize download link --- templates/footer.html | 2 +- templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 1648b27..4257132 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -9,7 +9,7 @@ <h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2> <p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p> {% set download = site.get('/download') %} - <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download) }}"> + <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div> diff --git a/templates/navbar.html b/templates/navbar.html index 95c07f9..4ba1148 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -54,7 +54,7 @@ </div> {% set download = site.get('/download') %} <div class="col-lg-2 col-12"> - <a class="btn btn-outline-light pull-right btn-block" href="{{ this.url_to(download) }}"> + <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div>

1 0

[tpo/master] Localize download link
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit cedcbdbe10e90791eed5e6e06ae55ac20f8baa5f Author: hiro <hiro(a)torproject.org> Date: Mon Mar 25 17:36:44 2019 +0100 Localize download link --- templates/footer.html | 2 +- templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 1648b27..4257132 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -9,7 +9,7 @@ <h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2> <p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p> {% set download = site.get('/download') %} - <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download) }}"> + <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div> diff --git a/templates/navbar.html b/templates/navbar.html index 95c07f9..4ba1148 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -54,7 +54,7 @@ </div> {% set download = site.get('/download') %} <div class="col-lg-2 col-12"> - <a class="btn btn-outline-light pull-right btn-block" href="{{ this.url_to(download) }}"> + <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div>

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 26 Mar '19

26 Mar '19

commit e74caefff7682f44dc5131f7d686b4837b1406df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 25 15:45:42 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 53 +++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 26cd0f97c..86bbac5a3 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1,12 +1,12 @@ # Translators: # N W, 2018 # erinm, 2018 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2018 # AO <ao(a)localizationlab.org>, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -223,15 +223,16 @@ msgstr "Voulez-vous faire un don par carte de crédit ou par PayPal ?" msgid "" "Thanks for your interest in donating cryptocurrency to the Tor Project." msgstr "" -"Merci de l'intérêt que vous portez au don de cryptomonnaie au projet Tor." +"Nous vous remercions de l’intérêt que vous portez au don de cryptomonnaie au" +" projet Tor." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:117 msgid "" "Please fill out this form and then send your coins to the appropriate " "wallet." msgstr "" -"Veuillez remplir ce formulaire et envoyer vos pièces de monnaie au " -"portefeuille approprié." +"Veuillez remplir ce formulaire et envoyer vos pièces au porte-monnaie " +"approprié." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:119 msgid "" @@ -239,39 +240,39 @@ msgid "" "your donation quickly, allow us to send you an acknowledgement, and let us " "know your communication preferences." msgstr "" -"Il n'est pas nécessaire de remplir le formulaire, mais cela nous informera " -"rapidement de votre don, nous permettra de vous envoyer un accusé de " -"réception et de nous faire part de vos préférences de communication." +"Il n’est pas nécessaire de remplir le formulaire, mais si vous le faites, " +"nous serons rapidement informés de votre don, ce qui nous permettra d’en " +"accuser réception et nous indiquera vos préférences de communication." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:125 msgid "" "Below you will find the cryptocurrencies we accept and our wallet addresses." msgstr "" "Vous trouverez ci-dessous les cryptomonnaies que nous acceptons et les " -"adresses de nos portefeuilles." +"adresses de nos porte-monnaie." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:127 msgid "" "The wallet addresses will be displayed again after you complete the form." msgstr "" -"Les adresses de votre portefeuille s'afficheront à nouveau une fois que vous" -" aurez terminé de remplir le formulaire." +"Les adresses de porte-monnaie seront affichées de nouveau une fois que vous " +"aurez rempli le formulaire." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:129 msgid "" "Please make sure to copy the wallet addresses exactly when making your " "donation, as we cannot recover funds sent to the wrong wallet." msgstr "" -"Veuillez vous assurer de copier l'adresse exacte de votre portefeuille au " -"moment de faire votre don, car nous ne pouvons pas récupérer les fonds " -"envoyés dans le faux portefeuille." +"Veuillez vous assurer de copier les adresses de porte-monnaie exactes lors " +"de votre don, car nous ne pouvons pas récupérer les fonds envoyés au mauvais" +" porte-monnaie." #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:135 msgid "" "If you have any questions, or would like to donate a cryptocurrency not " "listed above, please email us at giving(a)torproject.org." msgstr "" -"Si vous avez des questions, ou si vous souhaitez faire un don de " +"Si vous avez des questions ou si vous souhaitez faire don d’une " "cryptomonnaie qui ne figure pas dans la liste ci-dessus, veuillez nous " "envoyer un courriel à giving(a)torproject.org." @@ -370,28 +371,30 @@ msgstr "" #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:61 msgid "Thank you for standing up for privacy and freedom online." -msgstr "Merci d'avoir défendu la vie privée et la liberté online." +msgstr "" +"Nous vous remercions d’avoir défendu la vie privée et la liberté sur " +"Internet." #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:63 msgid "" "With your gift of cryptocurrency, you're helping the Tor Project give " "millions of people private access to the open web." msgstr "" -"Avec votre don de cryptomonnaie, vous aidez le Projet Tor à donner un accès " -"privé au Web ouvert à des millions de personnes." +"Votre don de cryptomonnaie aide le Projet Tor à donner un accès confidentiel" +" au Web ouvert à des millions de personnes." #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:65 msgid "" "Your contribution helps make Tor an even stronger tool against authoritarian" " governments and privacy-invading corporations." msgstr "" -"Votre contribution aide à faire de Tor un outil encore plus fort contre les " -"gouvernements autoritaires et les entreprises qui envahissent la vie privée." +"Votre contribution aide à encore renforcer Tor contre les gouvernements " +"autoritaires et les entreprises qui portent atteinte à la vie privée." #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:71 msgid "For your convenience, our wallet addresses are listed below." msgstr "" -"Pour votre commodité, les adresses de nos portefeuilles sont indiquées ci-" +"Pour plus de commodité, les adresses de nos porte-monnaie sont indiquées ci-" "dessous." #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:73 @@ -399,9 +402,9 @@ msgid "" "Please make sure to copy the wallet addresses exactly when making your " "donation, as we are unable to recover funds sent to the wrong wallet." msgstr "" -"Veuillez vous assurer de copier l'adresse exacte de votre portefeuille au " -"moment de faire votre don, car nous ne pouvons pas récupérer les fonds " -"envoyés dans le faux portefeuille." +"Veuillez vous assurer de copier exactement les adresses de porte-monnaie " +"lors de votre don, car nous ne pouvons pas récupérer les fonds envoyés au " +"mauvais porte-monnaie." #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:77 #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:77 @@ -753,7 +756,7 @@ msgstr "Mozilla égalera votre cadeau et doublera votre impact." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:61 msgid "Thank you for your support of the Tor Project." -msgstr "Merci pour votre assistance au projet Tor." +msgstr "Nous vous remercions de votre soutien du projet Tor." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:65 msgid ""

1 0