- tor-commits - lists.torproject.org

r24585: {translation} updating translation priority (translation/trunk/projects/torbutton/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:31:29 +0000 (Mon, 11 Apr 2011) New Revision: 24585 Modified: translation/trunk/projects/torbutton/po/.tx/config Log: updating translation priority Modified: translation/trunk/projects/torbutton/po/.tx/config =================================================================== --- translation/trunk/projects/torbutton/po/.tx/config 2011-04-11 15:25:55 UTC (rev 24584) +++ translation/trunk/projects/torbutton/po/.tx/config 2011-04-11 15:31:29 UTC (rev 24585) @@ -1,12 +1,12 @@ [main] host = https://www.transifex.net -[torproject.torbutton-torbutton-dtd-pot] +[torproject.1-torbutton-torbutton-dtd-pot] file_filter = <lang>/torbutton.dtd.po source_file = templates/torbutton.dtd.pot source_lang = en -[torproject.torbutton-torbutton-properties-pot] +[torproject.1-torbutton-torbutton-properties-pot] file_filter = <lang>/torbutton.properties.po source_file = templates/torbutton.properties.pot source_lang = en

1 0

r24584: {translation} updating the resource names, see #2713 for more info (translation/trunk/projects/website/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:25:55 +0000 (Mon, 11 Apr 2011) New Revision: 24584 Modified: translation/trunk/projects/website/po/.tx/config Log: updating the resource names, see #2713 for more info Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-04-11 14:50:21 UTC (rev 24583) +++ translation/trunk/projects/website/po/.tx/config 2011-04-11 15:25:55 UTC (rev 24584) @@ -1,4 +1,4 @@ -[torproject.website-docs-bridges-pot] +[torproject.2-website-docs-bridges-pot] file_filter = <lang>/docs/1-high.bridges.po source_file = templates/docs/1-high.bridges.pot source_lang = en @@ -28,7 +28,7 @@ source_file = templates/about/3-low.translators.pot source_lang = en -[torproject.website-about-overview-pot] +[torproject.2-website-about-overview-pot] file_filter = <lang>/about/2-medium.overview.po source_file = templates/about/2-medium.overview.pot source_lang = en @@ -98,7 +98,7 @@ source_file = templates/donate/3-low.matching-program.pot source_lang = en -[torproject.website-download-download-pot] +[torproject.1-website-download-download-pot] file_filter = <lang>/download/3-low.download.po source_file = templates/download/3-low.download.pot source_lang = en @@ -123,7 +123,7 @@ source_file = templates/press/3-low.inthemedia.pot source_lang = en -[torproject.website-projects-torbrowser-pot] +[torproject.3-website-projects-torbrowser-pot] file_filter = <lang>/projects/1-high.torbrowser.po source_file = templates/projects/1-high.torbrowser.pot source_lang = en @@ -171,7 +171,7 @@ source_file = templates/about/3-low.volunteers.pot source_lang = en -[torproject.website-index-pot] +[torproject.1-website-index-pot] file_filter = <lang>/1-high.index.po source_file = templates/1-high.index.pot source_lang = en @@ -211,7 +211,7 @@ source_file = templates/docs/2-medium.faq.pot source_lang = en -[torproject.website-docs-tor-doc-windows-pot] +[torproject.1-website-docs-tor-doc-windows-pot] file_filter = <lang>/docs/1-high.tor-doc-windows.po source_file = templates/docs/1-high.tor-doc-windows.pot source_lang = en @@ -236,7 +236,7 @@ source_file = templates/donate/3-low.donate-hardware.pot source_lang = en -[torproject.website-docs-highproxychain-pot] +[torproject.2-website-docs-highproxychain-pot] file_filter = <lang>/docs/1-high.proxychain.po source_file = templates/docs/1-high.proxychain.pot source_lang = en

1 0

r24583: {website} make sure we include the German .wmi files for German transl (website/trunk)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 14:50:21 +0000 (Mon, 11 Apr 2011) New Revision: 24583 Modified: website/trunk/po2wml.sh Log: make sure we include the German .wmi files for German translations Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-04-11 14:03:18 UTC (rev 24582) +++ website/trunk/po2wml.sh 2011-04-11 14:50:21 UTC (rev 24583) @@ -119,7 +119,7 @@ # Include the English footer for most of the # translations - if [[ $subdir != "ar" && $subdir != "pl" ]] + if [[ $subdir != "ar" && $subdir != "pl" && $subdir != "de" ]] then echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi @@ -153,6 +153,35 @@ echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi + # If the translation is German, include the + # correct header, menu files and footer + if [ $subdir = "de" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@de/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "de/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "de/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + # If the translation is Arabic, include the # correct header, css, menu files and footer if [ $subdir = "ar" ] @@ -217,7 +246,7 @@ # Include the English footer for most of the # translations - if [[ $lang != "ar" && $lang != "pl" ]] + if [[ $lang != "ar" && $lang != "pl" && $subdir != "de" ]] then echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi @@ -250,6 +279,34 @@ echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + # If the translation is German, include the + # correct header, menu files and footer + if [ $lang = "de" ] + then + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@de/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "de/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "de/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + # If the file is an Arabic translation, include the # correct header, css, menu files and footer if [ $lang = "ar" ]

1 0

r24582: {} deleting old file, now renamed to 1-high.index.po (translation/trunk/projects/website/po/de)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 14:03:18 +0000 (Mon, 11 Apr 2011) New Revision: 24582 Removed: translation/trunk/projects/website/po/de/3-low.index.po Log: deleting old file, now renamed to 1-high.index.po Deleted: translation/trunk/projects/website/po/de/3-low.index.po =================================================================== --- translation/trunk/projects/website/po/de/3-low.index.po 2011-04-11 13:33:34 UTC (rev 24581) +++ translation/trunk/projects/website/po/de/3-low.index.po 2011-04-11 14:03:18 UTC (rev 24582) @@ -1,273 +0,0 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR The Tor Project, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" -"PO-Revision-Date: 2011-03-11 21:44+0000\n" -"Last-Translator: carolyn <carolyn(a)torproject.org>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/en/index.wml:12 -msgid "Tor prevents anyone from learning your location or browsing habits." -msgstr "" - -#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/en/index.wml:13 -msgid "" -"Tor is for web browsers, instant messaging clients, remote logins, and more." -msgstr "" - -#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/en/index.wml:14 -msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android" -msgstr "" - -#. type: Content of: <div><div><div><div><h1> -#: /home/runa/tor/website/en/index.wml:16 -msgid "Anonymity Online" -msgstr "Anonymität online" - -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:17 -msgid "" -"Protect your privacy. Defend yourself against network surveillance and " -"traffic analysis." -msgstr "" - -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/en/index.wml:20 -msgid "" -"<a href=\"<page download/download>\"> <span class=\"download-tor\">Download " -"Tor</span></a>" -msgstr "" -"<a href=\"<page download/download>\"> <span class=\"download-tor\">Lade Tor " -"herunter</span></a>" - -#. type: Content of: <div><div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:26 -msgid "What is Tor?" -msgstr "Was ist Tor?" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:26 -msgid "" -"Tor is free software and an open network that helps you defend against a " -"form of network surveillance that threatens personal freedom and privacy, " -"confidential business activities and relationships, and state security known" -" as <a href=\"<page about/overview>\">traffic analysis</a><br><span " -"class=\"continue\"><a href=\"<page about/overview>\">Learn more about Tor " -"»</a></span>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:36 -msgid "Why Anonymity Matters" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:37 -msgid "" -"Tor protects you by bouncing your communications around a distributed " -"network of relays run by volunteers all around the world: it prevents " -"somebody watching your Internet connection from learning what sites you " -"visit, and it prevents the sites you visit from learning your physical " -"location. Tor works with many of your existing applications, including web " -"browsers, instant messaging clients, remote login, and other applications " -"based on the TCP protocol.<br><span class=\"continue\"><a href=\"<page " -"getinvolved/volunteer>\">Get involved with Tor »</a></span>" -msgstr "" - -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:50 -msgid "Our Projects" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:55 -msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:56 -msgid "<a href=\"<page torbutton/index>\">Torbutton</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:57 -msgid "" -"Torbutton is a 1-click way for Firefox users to enable or disable Tor in " -"Firefox." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:61 -msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:62 -msgid "<a href=\"https://check.torproject.org\">Check</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:63 -msgid "Check determines if you are successfully browsing with Tor." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:69 -msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:70 -msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:71 -msgid "" -"Vidalia is a graphical way to control and view Tor's connections and " -"settings." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:75 -msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:76 -msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:78 -msgid "" -"Tor Browser contains everything you need to safely browse the Internet." -msgstr "" - -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:90 -msgid "Who Uses Tor?" -msgstr "Wer benutzt Tor?" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:93 -msgid "" -"<a href=\"<page about/torusers>#normalusers\"><img " -"src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\"> Family & " -"Friends</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:96 -msgid "" -"People like you and your family use Tor to protect themselves, their " -"children, and their dignity while using the Internet." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:100 -msgid "" -"<a href=\"<page about/torusers>#executives\"><img " -"src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\"> Businesses</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:103 -msgid "" -"Businesses use Tor to research competition, keep business strategies " -"confidential, and facilitate internal accountability." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:107 -msgid "" -"<a href=\"<page about/torusers>#activists\"><img " -"src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists & Whistleblowers\"> " -"Activists</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:110 -msgid "" -"Activists use Tor to anonymously report abuses from danger zones. " -"Whistleblowers use Tor to safely report on corruption." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:114 -msgid "" -"<a href=\"<page about/torusers>#journalist\"><img " -"src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\"> Media</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:117 -msgid "" -"Journalists and the media use Tor to protect their research and sources " -"online." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:121 -msgid "" -"<a href=\"<page about/torusers>#military\"><img " -"src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law Enforcement\"> " -"Military & Law Enforcement</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:124 -msgid "" -"Militaries and law enforcement use Tor to protect their communications, " -"investigations, and intelligence gathering online." -msgstr "" - -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:128 -msgid "Announcements" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><div> -#: /home/runa/tor/website/en/index.wml:133 -msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:134 -msgid "" -"Tor helping with Egypt. Here's what we've learned <a " -"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent " -"events in Egypt</a>. And we're keeping our <a href=\"<page " -"press/inthemedia>\">In the media</a> page up to date with stories about how " -"we're helping around the world." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><div> -#: /home/runa/tor/website/en/index.wml:140 -msgid "<span class=\"month\">Jan</span><br><span class=\"day\">17</span>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:141 -msgid "" -"The latest stable Tor version, 0.2.1.29, is <a " -"href=\"http://archives.seul.org/or/announce/Jan-2011/msg00000.html\">released</a>." -" Tor 0.2.1.29 continues our recent code security audit work. The main fix " -"resolves a remote heap overflow vulnerability that can allow remote code " -"execution. Other fixes address a variety of assert and crash bugs, most of " -"which we think are hard to exploit remotely. All Tor users should upgrade." -msgstr ""

1 0

r24581: {} add german translation of navigation.wmi (and some other non (in website/trunk: . de include include/de)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 13:33:34 +0000 (Mon, 11 Apr 2011) New Revision: 24581 Added: website/trunk/de/ website/trunk/de/navigation.wmi website/trunk/include/de/ website/trunk/include/de/foot.wmi website/trunk/include/de/head.wmi website/trunk/include/de/info.wmi website/trunk/include/de/navigation.wmi website/trunk/include/de/side.wmi Log: add german translation of navigation.wmi (and some other non-translated .wmi files) Added: website/trunk/de/navigation.wmi =================================================================== --- website/trunk/de/navigation.wmi (rev 0) +++ website/trunk/de/navigation.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,25 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Startseite', + 'about/overview' , '�ber Tor', + 'docs/documentation' , 'Dokumentation', + 'projects/projects' , 'Projekte', + 'press/press' , 'Presse', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Shop', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Spenden', + 'getinvolved/volunteer' , 'Sich Engagieren', + ); + +:> + Added: website/trunk/include/de/foot.wmi =================================================================== --- website/trunk/include/de/foot.wmi (rev 0) +++ website/trunk/include/de/foot.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,131 @@ +#!/usr/bin/env wml +#use "functions.wmi" + + <div id="footer"> + <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> + <div class="about"> + <p>"Tor" and the "Onion Logo" are registered trademarks of + <a href="<page docs/trademark-faq>">The Tor Project, Inc.</a> + Content on this site is licensed under a <a + href="http://creativecommons.org/licenses/by/3.0/us/">Creative + Commons Attribution 3.0 United States License</a>, unless + otherwise noted.</p> + + </div> +  +  + <div class="col first"> + <h4>About Tor</h4> + <ul> + <li><a href="<page about/overview>">What Tor Does</a></li> + <li><a href="<page about/torusers>">Users of Tor</a></li> + <li><a href="<page about/corepeople>">Core Tor People</a></li> + <li><a href="<page about/sponsors>">Sponsors</a></li> + <li><a href="<page about/contact>">Contact Us</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Get Involved</h4> + <ul> + <li><a href="<page donate/donate>">Donate</a></li> + <li><a href="<page docs/documentation>#MailingLists">Mailing List</a></li> + <li><a href="<page getinvolved/mirrors>">Mirrors</a></li> + <li><a href="<page docs/hidden-services>">Hidden Services</a></li> + <li><a href="<page getinvolved/translation>">Translations</a></li> + <li><a href="<page getinvolved/open-positions>">Careers</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Documentation</h4> + <ul> + <li><a href="<page docs/tor-manual>">Manuals</a></li> + <li><a href="<page docs/documentation>">Installation Guides</a></li> + <li><a href="<wiki>">Tor Wiki</a></li> + <li><a href="<page docs/faq>">General Tor FAQ</a></li> + </ul> + </div> +  + +  + <div class="col wider"> + <h4>Languages</h4> + <: if (has_translations()) { :> + <p> + This page is also available in the following languages: + <: print list_translations() :>.<br /> + How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>. + </p> + <: }; :> + </div> + + + </div> +  + + </div> +  +</body> +</html> Added: website/trunk/include/de/head.wmi =================================================================== --- website/trunk/include/de/head.wmi (rev 0) +++ website/trunk/include/de/head.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,142 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>$(TITLE)</title> + <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" +type="application/rss+xml">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> + <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> + + #<link href="css/master.css" rel="stylesheet" type="text/css"> +  +  +# <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"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> +</head> +<body> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %navigation; + my @keys; + while (@navigation) { + my $key = shift @navigation; + my $val = shift @navigation; + push @keys, $key; + $navigation{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + # end navigation generation + <div id="calltoaction"> + <ul> + <:{ + my %calltoaction; + my @keys; + while (@calltoaction) { + my $key = shift @calltoaction; + my $val = shift @calltoaction; + push @keys, $key; + $calltoaction{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory, set active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + #if ($WML_SRC_BASENAME eq $base) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + # try to use a translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; + } + # default to english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>."> Added: website/trunk/include/de/info.wmi =================================================================== --- website/trunk/include/de/info.wmi (rev 0) +++ website/trunk/include/de/info.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,10 @@ +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="bulb">Tor Tip</h2> + <p>Tor is written for and supported by people like you. <a href="<page +donate/donate>">Donate today</a>!</p> + </div> +  +</div> + Added: website/trunk/include/de/navigation.wmi =================================================================== --- website/trunk/include/de/navigation.wmi (rev 0) +++ website/trunk/include/de/navigation.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,25 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Startseite', + 'about/overview' , '�ber Tor', + 'docs/documentation' , 'Dokumentation', + 'projects/projects' , 'Projekte', + 'press/press' , 'Presse', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Shop', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Spenden', + 'getinvolved/volunteer' , 'Sich Engagieren', + ); + +:> + Added: website/trunk/include/de/side.wmi =================================================================== --- website/trunk/include/de/side.wmi (rev 0) +++ website/trunk/include/de/side.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,91 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "sidenav.wmi" +<div class="img-shadow"> + <div id="sidenav"> + <: + # recursively search menu structure to see if it contains a given page + sub containsSub($$); + sub containsSub($$) { + my ($elements, $page) = @_; + for my $ele (@{$elements}) { + if (containsSub($ele->{'subelements'},$page)){ + return 1; + } elsif ($page eq $ele->{'url'}) { + return 1; + } + + } + return 0; + } + + # generate navigation menu + sub printNavMenu($$$); + sub printNavMenu($$$) { + my ($navmenu, $page, $lang) = @_; + print '<ul>'."\n"; + for my $navmenu (@{$navmenu}) { + # this menu entry is the current (active) page + if ($navmenu->{'url'} eq $page) { + + # the current page has nested menu elements + if ($navmenu->{'subelements'}) { # menu has dropdown + printf '<li class="dropdown active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; + + # the current (active) page does not have sub elements + } else { + printf '<li class="active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + + # a subelement of this menu item is the current (active) page + } elsif (containsSub($navmenu->{'subelements'}, $page)) { + printf '<li class="dropdown"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; #encapsulate subelements + # recurse to generate the expanded menu + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; #encapsulate subelements + + # the menu entry is not active and does not enclose the active page + } else { + + # if there are subelements, set collapsed style + if ($navmenu->{'subelements'}) { + printf '<li class="dropdown"><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + # regular menu entry + } else { + printf '<li><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + } + } + print '</ul>'."\n"; + } + + my $lang = "$(LANG)"; + + use Cwd; + use Cwd 'abs_path'; + use File::Spec; + + # get document path from site root + my $path = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)")); + my $page = $WML_SRC_BASENAME; + printNavMenu($sidenav, $path.'/'.$page, $lang); + :> + </div> +  +</div> +

1 0

[torperf/master] Update analyze_guards.py to take multiple .extradata files.
by karsten＠torproject.org 11 Apr '11

11 Apr '11

commit 31dc1db35befd0283b6e069cc33557537b590888 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Apr 8 02:19:52 2011 -0700 Update analyze_guards.py to take multiple .extradata files. --- analyze_guards.py | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/analyze_guards.py b/analyze_guards.py index 365d658..8d528f7 100755 --- a/analyze_guards.py +++ b/analyze_guards.py @@ -1,20 +1,13 @@ #!/usr/bin/python # -# This script takes a list of $idhex=nickname OR nickname=idhex lines and -# prints out min, avg, dev, max statistics based on the current consensus. +# This script takes a list of extradata files and tells you some statistics +# about the guard selection used by checking against the current consensus. # -# Be sure to include ratio in the filenames of idhexes that are supposedly -# chosen by consensus to descriptor ratio values. +# Use the script like this: +# ./analyze_guards.py slowratio50kb.extradata slowratio1mb50kb.extradata # -# Here is an example scriptlet for extracting the guards from an extrainfo -# file: -# awk '{ print $3; }' < torperfslowratio-50kb.extradata > slowratio50kb.extra -# -# Use this result like this: -# ./analyze_guards.py slowratio50kb.extra -# -# It should then print out ranking stats. Use your brain to determine if these -# stats make sense for the run you selected. +# It should then print out ranking stats one per file. Use your brain to +# determine if these stats make sense for the run you selected. import sys import math @@ -51,23 +44,29 @@ def analyze_list(router_map, idhex_list): return (min_rank, avg, math.sqrt(varience/(len(idhex_list)-absent-1)), max_rank, absent) -def main(): - f = file(sys.argv[1], "r") +def process_file(router_map, file_name): + f = file(file_name, "r") idhex_list = f.readlines() + guard_list = [] for i in xrange(len(idhex_list)): - if "~" in idhex_list[i]: char = "~" - else: char = "=" + line = idhex_list[i].split() + path = None + used = False + for word in line: + if word.startswith("PATH="): path = word[5:] + if word.startswith("USED_BY"): used = True + + if path and used: + guard = path.split(",") + guard_list.append(guard[0]) - split = idhex_list[i].split(char) + print "Guard rank stats (min, avg, dev, total, absent): " + print file_name + ": " + str(analyze_list(router_map, guard_list)) - if split[0][0] == "$": - idhex_list[i] = split[0] - else: - idhex_list[i] = "$"+split[1] +def main(): c = TorCtl.TorCtl.connect(HOST, PORT) - nslist = c.get_network_status() sorted_rlist = filter(lambda r: r.desc_bw > 0, c.read_routers(c.get_network_status())) router_map = {} for r in sorted_rlist: router_map["$"+r.idhex] = r @@ -88,8 +87,9 @@ def main(): for i in xrange(len(sorted_rlist)): sorted_rlist[i].list_rank = i - print "Guard rank stats (min, avg, dev, total, absent): " - print str(analyze_list(router_map, idhex_list)) + for file_name in sys.argv[1:]: + process_file(router_map, file_name) + if __name__ == '__main__': main()

1 0

[torperf/master] I hate everything.
by karsten＠torproject.org 11 Apr '11

11 Apr '11

commit 8c9237a2c15bbd5eada8d3093b317194e8fac581 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Apr 10 23:10:57 2011 -0700 I hate everything. Why didn't pychecker catch this?? --- entrycons.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/entrycons.py b/entrycons.py index fbbdc3c..c86f38d 100755 --- a/entrycons.py +++ b/entrycons.py @@ -19,7 +19,7 @@ class EntryTracker(TorCtl.ConsensusTracker): if self.consensus_count < DESCRIPTORS_NEEDED*len(self.ns_map): TorUtil.plog("NOTICE", "Insufficient routers to choose new guard. Waiting for more..") - self.need_guads = True + self.need_guards = True else: self.set_entries() self.need_guards = False

1 0

[torperf/master] Wait until we get 99% of all descriptors before choosing guards.
by karsten＠torproject.org 11 Apr '11

11 Apr '11

commit 69e2e707cae12a7936027a01937dd2ddd767c699 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Apr 8 02:21:17 2011 -0700 Wait until we get 99% of all descriptors before choosing guards. --- entrycons.py | 46 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 35 insertions(+), 11 deletions(-) diff --git a/entrycons.py b/entrycons.py index fb89f1f..fbbdc3c 100755 --- a/entrycons.py +++ b/entrycons.py @@ -7,6 +7,7 @@ import copy HOST = "127.0.0.1" SAMPLE_SIZE = 3 +DESCRIPTORS_NEEDED = 0.99 # 99% of descriptors must be downloaded class EntryTracker(TorCtl.ConsensusTracker): used_entries = [] @@ -14,13 +15,28 @@ class EntryTracker(TorCtl.ConsensusTracker): def __init__(self, conn, speed): TorCtl.ConsensusTracker.__init__(self, conn, consensus_only=False) self.speed = speed - self.set_entries() + self.used_entries = [] + if self.consensus_count < DESCRIPTORS_NEEDED*len(self.ns_map): + TorUtil.plog("NOTICE", + "Insufficient routers to choose new guard. Waiting for more..") + self.need_guads = True + else: + self.set_entries() + self.need_guards = False def new_consensus_event(self, n): TorCtl.ConsensusTracker.new_consensus_event(self, n) - TorUtil.plog("INFO", "New consensus arrived. Rejoice!") - self.used_entries = [] - self.set_entries() + self.need_guards = True + + def new_desc_event(self, n): + TorCtl.ConsensusTracker.new_desc_event(self, n) + if self.need_guards and self.consensus_count >= DESCRIPTORS_NEEDED*len(self.ns_map): + TorUtil.plog("INFO", "We have enough routers. Rejoice!") + self.used_entries = [] + self.set_entries() + self.need_guards = False + else: + self.need_guards = True def guard_event(self, event): TorCtl.EventHandler.guard_event(self, event) @@ -29,11 +45,16 @@ class EntryTracker(TorCtl.ConsensusTracker): def handle_entry_deaths(self, event): state = event.status if (state == "DOWN" or state == "BAD" or state == "DROPPED"): + if self.consensus_count < DESCRIPTORS_NEEDED*len(self.ns_map): + self.need_guards = True + TorUtil.plog("NOTICE", + "Insufficient routers to choose new guard. Waiting for more..") + return nodes_tuple = self.c.get_option("EntryNodes") nodes_list = nodes_tuple[0][1].split(",") try: nodes_list.remove(event.idhex) - nodes_list.append(self.get_next_router(event.idhex, nodes_list)) + nodes_list.append(self.get_next_guard()) self.c.set_option("EntryNodes", ",".join(nodes_list)) TorUtil.plog("NOTICE", "Entry: " + event.nick + ":" + event.idhex + " died, and we replaced it with: " + nodes_list[-1] + "!") @@ -64,15 +85,18 @@ class EntryTracker(TorCtl.ConsensusTracker): elif self.speed == "slowratio": routers.sort(lambda x,y: ratio_cmp(y,x)) - # Print top 5 routers + ratios - for i in xrange(5): - TorUtil.plog("DEBUG", self.speed+" router "+routers[i].nickname+" #"+str(i)+": " - +str(routers[i].bw)+"/"+str(routers[i].desc_bw)+" = " - +str(routers[i].bw/float(routers[i].desc_bw))) + # Print top 3 routers + ratios + if len(routers) < SAMPLE_SIZE: + TorUtil.plog("WARN", "Only "+str(len(routers))+" in our list!") + else: + for i in xrange(SAMPLE_SIZE): + TorUtil.plog("INFO", self.speed+" router "+routers[i].nickname+" #"+str(i)+": " + +str(routers[i].bw)+"/"+str(routers[i].desc_bw)+" = " + +str(routers[i].bw/float(routers[i].desc_bw))) return routers - def get_next_router(self, event, nodes_list): + def get_next_guard(self): # XXX: This is inefficient, but if we do it now, we're sure that # we're always using the very latest networkstatus and descriptor data sorted_routers = self.sort_routers(self.current_consensus().sorted_r)

1 0

[metrics-web/master] Write "Apr-2011" instead of "Apr-11" in graphs.
by karsten＠torproject.org 11 Apr '11

11 Apr '11

commit cbd4dcc23b68d1d357895662318793b5aa923979 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 11 10:54:56 2011 +0200 Write "Apr-2011" instead of "Apr-11" in graphs. --- rserve/graphs.R | 78 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 65 insertions(+), 13 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 70ab86f..c3d0ea3 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -30,7 +30,11 @@ plot_networksize <- function(start, end, path, dpi) { ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - + min(as.Date(networksize$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, max(networksize$value, na.rm = TRUE))) + scale_colour_hue("", breaks = c("relays", "bridges"), @@ -58,7 +62,11 @@ plot_versions <- function(start, end, path, dpi) { colour = version)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(versions$date, "%Y-%m-%d")) - + min(as.Date(versions$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, max(versions$relays, na.rm = TRUE))) + scale_colour_hue(name = "Tor version", h.start = 280, @@ -82,7 +90,11 @@ plot_platforms <- function(start, end, path, dpi) { colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(platforms$date, "%Y-%m-%d")) - + min(as.Date(platforms$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, max(platforms$value, na.rm = TRUE))) + scale_colour_hue(name = "Platform", h.start = 180, @@ -115,7 +127,11 @@ plot_bandwidth <- function(start, end, path, dpi) { colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(bandwidth$date, "%Y-%m-%d")) - + min(as.Date(bandwidth$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name="Bandwidth (MiB/s)", limits = c(0, max(bandwidth$value, na.rm = TRUE) / 2^20)) + scale_colour_hue(name = "", h.start = 90, @@ -144,7 +160,11 @@ plot_dirbytes <- function(start, end, path, dpi) { colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(dir$date, "%Y-%m-%d")) - + min(as.Date(dir$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name="Bandwidth (MiB/s)", limits = c(0, max(dir$value, na.rm = TRUE) / 2^20)) + scale_colour_hue(name = "", @@ -175,7 +195,11 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - + min(as.Date(networksize$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, max(networksize$value, na.rm = TRUE))) + scale_colour_hue(name = "Relay flags", h.start = 280, @@ -255,7 +279,11 @@ plot_direct_users <- function(start, end, country, path, dpi) { ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - + min(as.Date(u$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, max(u$users, na.rm = TRUE)), formatter = formatter) + opts(title = title) @@ -303,7 +331,11 @@ plot_bridge_users <- function(start, end, country, path, dpi) { ggplot(bridgeusers, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(bridgeusers$date, "%Y-%m-%d")) - + min(as.Date(bridgeusers$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, max(bridgeusers$users, na.rm = TRUE)), formatter = formatter) + opts(title = title) @@ -336,7 +368,11 @@ plot_gettor <- function(start, end, bundle, path, dpi) { ggplot(downloads, aes(x = as.Date(date, "%Y-%m-%d"), y = downloads)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(downloads$date, "%Y-%m-%d")) - + min(as.Date(downloads$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, max(downloads$downloads, na.rm = TRUE))) + opts(title = title) @@ -374,7 +410,11 @@ plot_torperf <- function(start, end, source, filesize, path, dpi) { geom_ribbon(data = torperf, aes(x = date, ymin = q1/1e3, ymax = q3/1e3, fill = "ribbon")) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(torperf$date, "%Y-%m-%d")) - + min(as.Date(torperf$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", limits = c(0, maxY) / 1e3) + scale_fill_manual(name = paste("Measured times on", ifelse(source == "all", "all sources", source), "per day"), @@ -424,7 +464,11 @@ plot_torperf_failures <- function(start, end, source, filesize, path, colour = variable)) + geom_point(size = 2) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(torperf$date, "%Y-%m-%d")) - + min(as.Date(torperf$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", formatter = "percent") + scale_colour_hue(name = paste("Problems encountered on", ifelse(source == "all", "all sources", source)), @@ -452,7 +496,11 @@ plot_connbidirect <- function(start, end, path, dpi) { colour = variable)) + geom_point(size = 2.5) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(connbidirect$date, "%Y-%m-%d")) - + min(as.Date(connbidirect$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "", formatter = "percent") + scale_colour_hue("", breaks = c("readnum", "writenum", "bothnum"), labels = c("Mostly reading", "Mostly writing", @@ -482,7 +530,11 @@ plot_routerdetail <- function(fingerprint, path) { ggplot(routerdetail, aes(x = as.Date(date, "%Y-%m-%d"), y = bw)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + + "https://metrics.torproject.org/", sep = ""), format = + c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ + cut(as.numeric(max(as.Date(routerdetail$date, "%Y-%m-%d")) - + min(as.Date(routerdetail$date, "%Y-%m-%d"))), + c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + scale_y_continuous(name = "") + opts(title = paste("Bandwidth history for ", fingerprint, "\n", sep = ""))

1 0

[bridgedb/master] Fix http utf8 issue: Add a content-type header to the HTML.
by karsten＠torproject.org 11 Apr '11

11 Apr '11

commit c69bc14f88e8b903bcf90538e8e5fac147805748 Author: Christian Fromme <kaner(a)strace.org> Date: Sat Apr 9 12:03:41 2011 +0200 Fix http utf8 issue: Add a content-type header to the HTML. --- lib/bridgedb/Server.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 7b7ff55..2becee8 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -100,7 +100,10 @@ class WebResource(twisted.web.resource.Resource): + "".join(("<li>%s</li>"%d for d in self.domains)) + "</ul>" else: email_domain_list = "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[8]) + "</p>" - html_msg = "<html><body>" \ + html_msg = "<html><head>"\ + + "<meta http-equiv=\"Content-Type\" content=\"text/html;"\ + + " charset=UTF-8\"/>" \ + + "</head><body>" \ + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[0]) \ + "<pre id=\"bridges\">" \ + "%s" \

1 0