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

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 30 Oct '17

30 Oct '17

commit e288eb11779f2d07d392c2e658f307e77304d4ee Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 30 21:46:11 2017 +0000 Update translations for tails-persistence-setup_completed --- ca/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index dc59202a2..46ce45063 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-10-29 21:45+0000\n" +"PO-Revision-Date: 2017-10-30 21:31+0000\n" "Last-Translator: Vte A.F <viarfer3(a)inf.upv.es>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 30 Oct '17

30 Oct '17

commit da32e3bf4d2eb7c1057e352236b9a01ea32764d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 30 21:46:06 2017 +0000 Update translations for tails-persistence-setup --- ca/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index dc59202a2..46ce45063 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-10-29 21:45+0000\n" +"PO-Revision-Date: 2017-10-30 21:31+0000\n" "Last-Translator: Vte A.F <viarfer3(a)inf.upv.es>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 30 Oct '17

30 Oct '17

commit 51260a8e42db187e3ca3f02b0a3619ee9000e4ed Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 30 21:45:59 2017 +0000 Update translations for liveusb-creator_completed --- ca/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index ae120e0dc..22fcf800c 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-25 14:02+0200\n" -"PO-Revision-Date: 2017-10-29 21:26+0000\n" +"PO-Revision-Date: 2017-10-30 21:31+0000\n" "Last-Translator: Vte A.F <viarfer3(a)inf.upv.es>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 30 Oct '17

30 Oct '17

commit 610b33f7b2b2df6292f9339001f06f079b13b6aa Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 30 21:45:54 2017 +0000 Update translations for liveusb-creator --- ca/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index ae120e0dc..22fcf800c 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-25 14:02+0200\n" -"PO-Revision-Date: 2017-10-29 21:26+0000\n" +"PO-Revision-Date: 2017-10-30 21:31+0000\n" "Last-Translator: Vte A.F <viarfer3(a)inf.upv.es>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[nyx/master] Provide sqlite3 intructions for Gentoo
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 8be7ef638121deef6c1b9f41353cae7c1ec76e13 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 14:07:20 2017 -0700 Provide sqlite3 intructions for Gentoo Message thanks to Toralf. --- nyx/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 11cdf33..69c8099 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -66,6 +66,11 @@ don't bundle this with the interpreter. Please let us know at... https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs """ +SQLITE_UNAVAILABLE_GENTOO = """\ +Python's sqlite3 module is unavailable. For Gentoo please run +emerge dev-lang/python with USE=sqlite. +""" + SQLITE_UNAVAILABLE_FREEBSD = """\ Python's sqlite3 module is unavailable. Please run... @@ -75,7 +80,9 @@ Python's sqlite3 module is unavailable. Please run... try: import sqlite3 except ImportError: - if stem.util.system.is_bsd(): + if stem.util.system.is_gentoo(): + print(SQLITE_UNAVAILABLE_GENTOO) + elif stem.util.system.is_bsd(): print(SQLITE_UNAVAILABLE_FREEBSD) else: print(SQLITE_UNAVAILABLE)

1 0

[nyx/master] Provide a nicer error when sqlite3 is unavailable
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 4bfe05dc045d4d0f3e17bec730a1e279ef35a8e2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 13:53:19 2017 -0700 Provide a nicer error when sqlite3 is unavailable Oops! Turns out this isn't available by default on FreeBSD or Gentoo. Providing a nicer notice, encouraging folks to contact us so we can provide per-platform suggestions for how to get it. --- nyx/__init__.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index ee81f51..11cdf33 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -46,7 +46,6 @@ import contextlib import distutils.spawn import os import platform -import sqlite3 import sys import threading import time @@ -60,6 +59,29 @@ import stem.util.log import stem.util.system import stem.util.tor_tools +SQLITE_UNAVAILABLE = """\ +Python's sqlite3 module is unavailable. Unfortunatley some platforms +don't bundle this with the interpreter. Please let us know at... + + https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs +""" + +SQLITE_UNAVAILABLE_FREEBSD = """\ +Python's sqlite3 module is unavailable. Please run... + + sudo pkg install py27-sqlite3 +""" + +try: + import sqlite3 +except ImportError: + if stem.util.system.is_bsd(): + print(SQLITE_UNAVAILABLE_FREEBSD) + else: + print(SQLITE_UNAVAILABLE) + + sys.exit(1) + __version__ = '1.4.6-dev' __release_date__ = 'April 28, 2011' __author__ = 'Damian Johnson'

1 0

[nyx/master] Suppress errors if os.putenv doesn't work
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit bcb01229bef28ac087f9db0ea96bfe3f47875df0 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 13:44:10 2017 -0700 Suppress errors if os.putenv doesn't work These are to sidestep issues on some platforms. Generally certainly fine if they don't take effect. Caught thanks to tor-relays@ beta tester on FreeBSD... nyx: environment corrupt; missing value for Traceback (most recent call last): File "./run_nyx", line 14, in <module> nyx.main() File "/usr/home/ryan/nyx/nyx/__init__.py", line 147, in main nyx.starter.main() File "/usr/home/ryan/nyx/stem/util/conf.py", line 289, in wrapped return func(*args, config = config, **kwargs) File "/usr/home/ryan/nyx/nyx/starter.py", line 90, in main os.putenv('LANG', 'C') # make subcommands (ps, netstat, etc) provide english results OSError: [Errno 14] Bad address --- nyx/starter.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nyx/starter.py b/nyx/starter.py index 789e67c..6f90bfd 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -87,8 +87,15 @@ def main(config): _use_unicode() _set_process_name() - os.putenv('LANG', 'C') # make subcommands (ps, netstat, etc) provide english results - os.putenv('ESCDELAY', '0') # make 'esc' take effect right away + try: + os.putenv('LANG', 'C') # make subcommands (ps, netstat, etc) provide english results + except: + pass + + try: + os.putenv('ESCDELAY', '0') # make 'esc' take effect right away + except: + pass try: nyx.curses.start(nyx.draw_loop, acs_support = config.get('acs_support', True), transparent_background = True, cursor = False)

1 0

[webwml/master] Bug 23484: 2017 Homepage donation banner
by hiro＠torproject.org 30 Oct '17

30 Oct '17

commit 7f17ea251531e45fdf372ee8fd65a02baf9ad3e3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 15 02:05:59 2016 -0500 Bug 23484: 2017 Homepage donation banner --- css/donation-banner.css | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ en/index.wml | 2 +- images/onion-hand.png | Bin 0 -> 69055 bytes include/head.wmi | 20 +++++++++ js/donation_banner.js | 33 ++++++++++++++ 5 files changed, 167 insertions(+), 1 deletion(-) diff --git a/css/donation-banner.css b/css/donation-banner.css new file mode 100644 index 00000000..57c0af39 --- /dev/null +++ b/css/donation-banner.css @@ -0,0 +1,113 @@ +#banner-wrapper { + -khtml-user-select: none; /* Konqueror */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + display: block; + height: 150px; + justify-content: center; + left: 0px; + margin-top: 0px; + min-width: 900px; + opacity: 1; + position: absolute; + user-select: none; + width: 100%; + z-index: 1; +} +#banner-wrapper:before { + background-color: #551373; + background-image: url('../images/onion-hand.png'); + background-position: calc(50% - 40px) 50%; + background-size: cover; + content: ""; + height: 150px; + left: 0px; + position: absolute; + top: 0px; + right: 0px; +} +#banner-contents-container { + align-items: center; + height: 100%; + margin: 0 auto; + max-width: 960px; + position: relative; + width: 960px; +} +#banner-tagline { + align-items: center; + bottom: 60px; + color: white; + display: flex; + font-family: monospace; + font-weight: bold; + left: 200px; + position: absolute; + right: 0px; + text-align: start; + text-transform: uppercase; + top: 10px; +} +#banner-slogan { + align-items: center; + bottom: 30px; + color: #f8f8a0; + display: flex; + font-size: 20px; + font-family: monospace; + font-weight: bold; + left: 200px; + position: absolute; + right: 285px; + text-align: start; + top: 90px; + white-space: nowrap; +} +#banner-mozilla { + align-items: center; + bottom: 5px; + color: white; + display: flex; + font-size: 18px; + font-family: sans-serif; + left: 200px; + position: absolute; + right: 285px; + text-align: start; + top: 120px; + white-space: nowrap; +} +#banner-donate-button { + align-items: center; + background-color: #13a513; + border: 0px; + bottom: 10px; + color: #fbf7ef; + display: flex; + font-family: sans-serif; + font-size: 22px; + font-weight: bold; + justify-content: center; + left: 630px; + letter-spacing: -0.00em; + position: absolute; + right: 10px; + top: 90px; +} +#banner-donate-button:hover { + background-color: #38bc38; +} +#banner-spacer { + background-color: #551373; + display: block; + height: 150px; + position: relative; + top: 0px; + left: 0px; + width: 100%; +} +body { + min-width: 960px; +} diff --git a/en/index.wml b/en/index.wml index 478e96e9..5c166f10 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" DONATION_BANNER="true" <div id="home"> diff --git a/images/onion-hand.png b/images/onion-hand.png new file mode 100644 index 00000000..00a5a41c Binary files /dev/null and b/images/onion-hand.png differ diff --git a/include/head.wmi b/include/head.wmi index dc4d5e26..f496462f 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -33,6 +33,7 @@ # begin WML to generate css/js paths <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">"> <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.min.css" rel="stylesheet">"> + <ifeq "$(DONATION_BANNER)" "true" "<link href="$(DOCROOT)/css/donation-banner.css" rel="stylesheet">"> #<link href="css/master.min.css" rel="stylesheet">  +<ifeq "$(DONATION_BANNER)" "true" " + <div id="banner-wrapper"> + <div id="banner-contents-container"> + <div id="banner-tagline"><span><noscript>Protecting the Privacy of Millions Every Day</noscript></span></div> + <div id="banner-slogan"><span>Tor: Powering Digital Resistance</span></div> + <div id="banner-mozilla"><span>Give today and Mozilla will match your gift!</span></div> + <a id="banner-donate-button-link" + href="https://www.torproject.org/donate/donate-pdr-hp"> + <div id="banner-donate-button"> + <span>Donate Now! ▶</span> + </div> + </a> + </div> + </div> + <div id="banner-spacer"></div> + <script src="js/donation_banner.js"></script> + +"> <div id="wrap"> <div id="header"> <h1 id="logo"><a href="<page index>">Tor</a></h1> diff --git a/js/donation_banner.js b/js/donation_banner.js new file mode 100644 index 00000000..239fcafd --- /dev/null +++ b/js/donation_banner.js @@ -0,0 +1,33 @@ +/* jshint esnext:true */ + +let kTaglines = [ + "Protecting Journalists, Whistleblowers, & Activists Since 2006", + "Networking Freedom Worldwide", + "Freedom Online", + "Fostering Free Expression Worldwide", + "Protecting the Privacy of Millions Every Day", +]; + +let kTaglineSizes = [ + 30, + 40, + 48, + 36, + 36, +]; + +// Returns a random integer x, such that 0 <= x < max +let randomInteger = function (max) { + return Math.floor(max * Math.random()); +}; + +// The main donation banner function. +let runDonationBanner = function () { + // Load random tag line once page is loaded + let index = randomInteger(kTaglines.length); + let taglineElement = document.querySelector("#banner-tagline span"); + taglineElement.innerText = kTaglines[index]; + taglineElement.style.fontSize = kTaglineSizes[index] + "px"; +}; + +runDonationBanner();

1 0

[webwml/master] Merge branch '23484' of https://github.com/arthuredelstein/webml
by hiro＠torproject.org 30 Oct '17

30 Oct '17

commit 1e061356c2bb079bbddf9e93e3b43a1f4fba0bca Merge: 05ccf93e 7f17ea25 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Oct 30 19:22:47 2017 +0100 Merge branch '23484' of https://github.com/arthuredelstein/webml css/donation-banner.css | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ en/index.wml | 2 +- images/onion-hand.png | Bin 0 -> 69055 bytes include/head.wmi | 20 +++++++++ js/donation_banner.js | 33 ++++++++++++++ 5 files changed, 167 insertions(+), 1 deletion(-)

1 0

[webwml/staging] Remove unused script tag
by hiro＠torproject.org 30 Oct '17

30 Oct '17

commit c8218256d842143c599614c87088700ebce7d8ed Author: hiromipaw <hiro(a)torproject.org> Date: Fri Sep 8 17:45:08 2017 +0200 Remove unused script tag --- projects/en/tbb-head.wmi | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/en/tbb-head.wmi b/projects/en/tbb-head.wmi index 4062b8cc..eeb32b35 100644 --- a/projects/en/tbb-head.wmi +++ b/projects/en/tbb-head.wmi @@ -28,7 +28,6 @@  -# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> # end WML to generate css/js paths <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

1 0