tor-commits March 2018

tor-commits@lists.torproject.org

15 participants
1430 discussions

[metrics-web/master] Provide no-data pictures, pdfs, and csv files instead of server error.
by karsten＠torproject.org 28 Mar '18

28 Mar '18

commit 533225c4250490857b0ed3e31232914da725cc13 Author: iwakeh <iwakeh(a)torproject.org> Date: Sat Mar 24 09:31:08 2018 +0000 Provide no-data pictures, pdfs, and csv files instead of server error. Implements task-25264. --- build.xml | 1 + src/main/R/rserver/graphs.R | 20 ++++++++++++++++++++ .../torproject/metrics/web/RObjectGenerator.java | 7 ++++--- src/main/resources/web/images/no-data-available.pdf | Bin 0 -> 33824 bytes src/main/resources/web/images/no-data-available.png | Bin 0 -> 26209 bytes src/main/resources/web/images/no-data-available.xcf | Bin 0 -> 104450 bytes 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 3b4222e..17160ee 100644 --- a/build.xml +++ b/build.xml @@ -504,6 +504,7 @@ <copy todir="${rdatadir}" > <fileset dir="${modulebase}/clients/RData" includes="*.RData" /> <fileset dir="${modulebase}/webstats/RData" includes="*.RData" /> + <fileset dir="${resources}/web/images/" includes="no-data-available.*" /> </copy> </target> diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index 57d2be2..332204b 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -328,6 +328,26 @@ stats_dir <- "/srv/metrics.torproject.org/metrics/shared/stats/" rdata_dir <- "/srv/metrics.torproject.org/metrics/shared/RData/" +# Helper function that copies the appropriate no data object to filename. +copy_no_data <- function(filename) { + len <- nchar(filename) + extension <- substr(filename, len - 3, len) + if (".csv" == extension) { + write("# No data available for the given parameters.", file=filename) + } else { + file.copy(paste(rdata_dir, "no-data-available", extension, sep = ""), + filename) + } +} + +# Helper function wrapping calls into error handling. +robust_call <- function(wrappee, filename) { + tryCatch(eval(wrappee), error = function(e) copy_no_data(filename), + finally = if (!file.exists(filename) || file.size(filename) == 0) { + copy_no_data(filename) + }) +} + prepare_networksize <- function(start, end) { read.csv(paste(stats_dir, "servers.csv", sep = ""), colClasses = c("date" = "Date")) %>% diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java index 04bda0c..e3a2419 100644 --- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java +++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java @@ -117,19 +117,20 @@ public class RObjectGenerator implements ServletContextListener { == null) { return null; } - String function = this.availableGraphs.get(requestedGraph) - .getFunction(); Map<String, String[]> checkedParameters = GraphParameterChecker .getInstance().checkParameters(requestedGraph, parameterMap); if (checkedParameters == null) { return null; } StringBuilder queryBuilder = new StringBuilder(); + queryBuilder.append("robust_call(as.call(list("); if ("csv".equalsIgnoreCase(fileType)) { queryBuilder.append("write_"); } else { queryBuilder.append("plot_"); } + String function = this.availableGraphs.get(requestedGraph) + .getFunction(); queryBuilder.append(function).append("("); StringBuilder imageFilenameBuilder = new StringBuilder(requestedGraph); @@ -154,7 +155,7 @@ public class RObjectGenerator implements ServletContextListener { } imageFilenameBuilder.append(".").append(fileType); String imageFilename = imageFilenameBuilder.toString(); - queryBuilder.append("path = '%s')"); + queryBuilder.append("path = '%1$s'))), '%1$s')"); String query = queryBuilder.toString(); File imageFile = new File(this.cachedGraphsDirectory + "/" + imageFilename); diff --git a/src/main/resources/web/images/no-data-available.pdf b/src/main/resources/web/images/no-data-available.pdf new file mode 100644 index 0000000..8c9ca25 Binary files /dev/null and b/src/main/resources/web/images/no-data-available.pdf differ diff --git a/src/main/resources/web/images/no-data-available.png b/src/main/resources/web/images/no-data-available.png new file mode 100644 index 0000000..36310ad Binary files /dev/null and b/src/main/resources/web/images/no-data-available.png differ diff --git a/src/main/resources/web/images/no-data-available.xcf b/src/main/resources/web/images/no-data-available.xcf new file mode 100644 index 0000000..42a7170 Binary files /dev/null and b/src/main/resources/web/images/no-data-available.xcf differ

1 0

[metrics-web/master] Use 'StringBuilder#append' consistently.
by karsten＠torproject.org 28 Mar '18

28 Mar '18

commit 03fc04edbd31490dcb1c31499c6ddce12a214328 Author: iwakeh <iwakeh(a)torproject.org> Date: Sat Mar 24 09:31:07 2018 +0000 Use 'StringBuilder#append' consistently. --- .../java/org/torproject/metrics/web/RObjectGenerator.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java index 5d9b29c..04bda0c 100644 --- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java +++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java @@ -188,18 +188,18 @@ public class RObjectGenerator implements ServletContextListener { String parameterName = parameter.getKey(); String[] parameterValues = parameter.getValue(); for (String param : parameterValues) { - tableFilenameBuilder.append("-" + param); + tableFilenameBuilder.append("-").append(param); } if (parameterValues.length < 2) { - queryBuilder.append(parameterName + " = '" - + parameterValues[0] + "', "); + queryBuilder.append(parameterName).append(" = '") + .append(parameterValues[0]).append("', "); } else { - queryBuilder.append(parameterName + " = c("); + queryBuilder.append(parameterName).append(" = c("); for (int i = 0; i < parameterValues.length - 1; i++) { - queryBuilder.append("'" + parameterValues[i] + "', "); + queryBuilder.append("'").append(parameterValues[i]).append("', "); } - queryBuilder.append("'" + parameterValues[ - parameterValues.length - 1] + "'), "); + queryBuilder.append("'").append(parameterValues[ + parameterValues.length - 1]).append("'), "); } } tableFilenameBuilder.append(".tbl");

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit d32d6516bd7752dfa9b3bb25a27d9a0112c1b471 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:19:50 2018 +0000 Update translations for tails-greeter-2_completed --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 997bfaca1..89edeee72 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-22 14:15+0100\n" +"POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01(a)yahoo.com.br>, 2016\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 49218b1cbd948691a502ca04b587d8cc295602c8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:19:45 2018 +0000 Update translations for tails-greeter-2 --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 997bfaca1..89edeee72 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-22 14:15+0100\n" +"POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01(a)yahoo.com.br>, 2016\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 7ee510801debe539e517c183d989a460c56f0dc2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:18:41 2018 +0000 Update translations for tails-onioncircuits_completed --- pt_BR/onioncircuits.pot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/onioncircuits.pot b/pt_BR/onioncircuits.pot index 36606d25d..13abed4aa 100644 --- a/pt_BR/onioncircuits.pot +++ b/pt_BR/onioncircuits.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Communia <ameaneantie(a)riseup.net>, 2016-2017 +# Communia <ameaneantie(a)riseup.net>, 2016-2018 # Maicon Grahl <maicongrahl(a)hotmail.com>, 2016 # Rodrigo Horstmann Castilhos <rhcastilhos(a)gmail.com>, 2016 msgid "" @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-02-20 19:11+0000\n" -"Last-Translator: Joeffison Silvério de Andrade <joeffison(a)gmail.com>\n" +"PO-Revision-Date: 2018-03-28 13:51+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +77,7 @@ msgstr "Impressão digital:" #: ../onioncircuits:608 msgid "Published:" -msgstr "Publicad:" +msgstr "Publicado:" #: ../onioncircuits:609 msgid "IP:"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 2674e08c9b55c60e2966543d5b08cceaef1fa52b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:18:36 2018 +0000 Update translations for tails-onioncircuits --- pt_BR/onioncircuits.pot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/onioncircuits.pot b/pt_BR/onioncircuits.pot index 36606d25d..13abed4aa 100644 --- a/pt_BR/onioncircuits.pot +++ b/pt_BR/onioncircuits.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Communia <ameaneantie(a)riseup.net>, 2016-2017 +# Communia <ameaneantie(a)riseup.net>, 2016-2018 # Maicon Grahl <maicongrahl(a)hotmail.com>, 2016 # Rodrigo Horstmann Castilhos <rhcastilhos(a)gmail.com>, 2016 msgid "" @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-02-20 19:11+0000\n" -"Last-Translator: Joeffison Silvério de Andrade <joeffison(a)gmail.com>\n" +"PO-Revision-Date: 2018-03-28 13:51+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +77,7 @@ msgstr "Impressão digital:" #: ../onioncircuits:608 msgid "Published:" -msgstr "Publicad:" +msgstr "Publicado:" #: ../onioncircuits:609 msgid "IP:"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit ee3f056aeffc1a79c7672924a064c0b8a6054609 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:16:51 2018 +0000 Update translations for tails-misc --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 25d7675d2..882496869 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-28 12:47+0000\n" +"PO-Revision-Date: 2018-03-28 14:01+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -162,7 +162,7 @@ msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." -msgstr "A atualização falhou. Isto pode ser devido a um problema de rede. Por favor, verifique a sua conexão de rede, tente reiniciar o Tails, ou leia o registro do sistema para compreender melhor o problema." +msgstr "A atualização falhou. Isto pode ser devido a um problema de rede. Por favor, verifique a sua conexão de rede, tente reiniciar o Tails ou leia o registro do sistema para compreender melhor o problema." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock"

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 820e8f8b8fdcabddf748cdfa3e83f342e1acc95e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:16:23 2018 +0000 Update translations for mat-gui_completed --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index cec133090..8b86cbd25 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-03-28 13:07+0000\n" +"PO-Revision-Date: 2018-03-28 13:59+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -86,7 +86,7 @@ msgstr "Remover arquivo não suportado dos arquivos" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "Remover arquivo não suportado (e como tal não anônimo) do arquivo de saída" +msgstr "Remover documento sem suporte (e como tal não-anônimo) do arquivo produzido" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 371b4ff4c7015292fd021a4c74f092a8919826ad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:16:18 2018 +0000 Update translations for mat-gui --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index cec133090..8b86cbd25 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-03-28 13:07+0000\n" +"PO-Revision-Date: 2018-03-28 13:59+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -86,7 +86,7 @@ msgstr "Remover arquivo não suportado dos arquivos" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "Remover arquivo não suportado (e como tal não anônimo) do arquivo de saída" +msgstr "Remover documento sem suporte (e como tal não-anônimo) do arquivo produzido" #: mat-gui:280 msgid "Unknown"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 651c10b8cb0261d82f35dfdc4acac6eae298bfed Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 14:15:54 2018 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index fb7a2901c..16e97fa7f 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Communia <ameaneantie(a)riseup.net>, 2013-2017 +# Communia <ameaneantie(a)riseup.net>, 2013-2018 # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 # Carlos Villela, 2014 @@ -29,8 +29,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2017-11-11 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-03-28 14:05+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -366,7 +366,7 @@ msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start on it. Please try installing on a " "different model." -msgstr "A memória USB \"%(pretty_name)s\" está configurado como 'não-removível' pelo fabricante e o Tais não funcionará nele. Por favor, tente instalar Tails em um outro modelo de memória USB.." +msgstr "A memória USB \"%(pretty_name)s\" está configurada como 'não-removível' pelo fabricante e o Tais não funcionará nela. Por favor, tente instalar Tails em um outro modelo de memória USB." #: ../tails_installer/gui.py:567 #, python-format

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2018