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

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit b89bba08de450ed1b2cfd905904a5a48a4a2c2cf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 13:22:00 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- fr/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr/torbutton.properties b/fr/torbutton.properties index 4846bc9f6..a59f541ff 100644 --- a/fr/torbutton.properties +++ b/fr/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=La connexion est chiffrée (service onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=L’autorisation du client manque au service onion Tor +onionServices.authPrompt.description=%S demande votre clé privée. +onionServices.authPrompt.keyPlaceholder=Saisissez votre clé privée pour ce service onion onionServices.authPrompt.done=Terminé -onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.doneAccessKey=t +onionServices.authPrompt.invalidKey=Veuillez saisir une clé valide (52 caractères Base32 ou 44 caractères Base64) +onionServices.authPrompt.failedToSetKey=Impossible de configurer Tor avec votre clé

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit 6c3d919b9bf7de61e42f5c17f3b07f95f3768c6e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 13:20:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index d4a93171d..d1f82a4ee 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -438,6 +438,8 @@ msgid "" "3. (Recommended) Verify the [file's " "signature](https://support.torproject.org/en/tbb/how-to-verify-signature/)." msgstr "" +"3. (Recomendado) Verifique a [assinatura do " +"arquivo](https://support.torproject.org/en/tbb/how-to-verify-signature/)" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body)

1 0

[translation/tails-iuk_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk_completed
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit 5bacf8aa38fe4cc705dac770c0860f37d1327edb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 13:19:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk_completed --- fr.po | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 290 insertions(+) diff --git a/fr.po b/fr.po new file mode 100644 index 000000000..ea7ef8b2c --- /dev/null +++ b/fr.po @@ -0,0 +1,290 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# 9e126bf33b0488d9fabdeb33ff29614a, 2015 +# bassmax, 2013 +# Alex <chioubaca(a)gmail.com>, 2014 +# tneskovic <antoine_ecuador(a)yahoo.fr>, 2014 +# AO <ao(a)localizationlab.org>, 2015,2018-2019 +# bassmax, 2013 +# Emmanuel Simond <emmanuel.simond(a)gmail.com>, 2014 +# Emmanuel Simond <emmanuel.simond(a)gmail.com>, 2014 +# AO <ao(a)localizationlab.org>, 2017-2018 +# French language coordinator <french.translation(a)rbox.me>, 2015-2016 +# Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015 +# Kleber Blondel <tristanblond47(a)gmail.com>, 2019 +# monsieurtino <monsieurtino(a)mailoo.org>, 2014 +# monsieurtino <monsieurtino(a)mailoo.org>, 2014 +# Owen, 2015 +# phil beau <philippebeau0(a)gmail.com>, 2016 +# phil beau <philippebeau0(a)gmail.com>, 2016 +# rike, 2014 +# rike, 2014 +# Sabrina Cater <sabcat(a)gmx.fr>, 2015 +# Thomas Chauchefoin <thomas(a)chauchefoin.fr>, 2016 +# tneskovic <antoine_ecuador(a)yahoo.fr>, 2014 +# Towinet, 2013-2014 +# 9e126bf33b0488d9fabdeb33ff29614a, 2015 +# AO <ao(a)localizationlab.org>, 2015 +# xin, 2019 +# xin, 2019 +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2019-10-21 09:17+0200\n" +"PO-Revision-Date: 2019-11-20 13:06+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" +"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:524 +#: ../lib/Tails/IUK/Frontend.pm:710 +msgid "" +"For debugging information, execute the following command: sudo tails-" +"debugging-info" +msgstr "Pour obtenir les informations de débogage, exécutez la commande suivante : sudo tails-debugging-info" + +#: ../lib/Tails/IUK/Frontend.pm:218 +msgid "Error while checking for upgrades" +msgstr "Erreur lors de la vérification des mises à jour" + +#: ../lib/Tails/IUK/Frontend.pm:221 +msgid "" +"Could not determine whether an upgrade is available from our website.\n" +"\n" +"Check your network connection, and restart Tails to try upgrading again.\n" +"\n" +"If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Impossible de déterminer si une mise à jour est disponible sur notre site web.\n\nVérifiez votre connexion réseau et redémarrez Tails pour essayer à nouveau de mettre à jour.\n\nSi le problème persiste, allez à file:///usr/share/doc/tails/website/doc/upgrade/error/check.fr.html" + +#: ../lib/Tails/IUK/Frontend.pm:236 +msgid "no automatic upgrade is available from our website for this version" +msgstr "aucune mise à jour automatique n’est disponible sur notre site web pour cette version" + +#: ../lib/Tails/IUK/Frontend.pm:242 +msgid "your device was not created using Tails Installer" +msgstr "votre périphérique n’a pas été créé avec l’Installeur de Tails" + +#: ../lib/Tails/IUK/Frontend.pm:247 +msgid "Tails was started from a DVD or a read-only device" +msgstr "Tails a été démarré à partir d’un DVD ou d’un périphérique en lecture seule" + +#: ../lib/Tails/IUK/Frontend.pm:252 +msgid "there is not enough free space on the Tails system partition" +msgstr "il n’y a pas assez d’espace libre sur la partition système de Tails" + +#: ../lib/Tails/IUK/Frontend.pm:257 +msgid "not enough memory is available on this system" +msgstr "il n’y a pas assez de mémoire disponible sur ce système" + +#: ../lib/Tails/IUK/Frontend.pm:263 +#, perl-brace-format +msgid "No explanation available for reason '%{reason}s'." +msgstr "Il n’y a aucune explication pour la raison '%{reason}s'." + +#: ../lib/Tails/IUK/Frontend.pm:283 +msgid "The system is up-to-date" +msgstr "Le système est à jour" + +#: ../lib/Tails/IUK/Frontend.pm:288 +msgid "This version of Tails is outdated, and may have security issues." +msgstr "Cette version de Tails est obsolète et peut poser des problèmes de sécurité." + +#: ../lib/Tails/IUK/Frontend.pm:320 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{space_needed}s of free space on" +" Tails system partition, but only %{free_space}s is available." +msgstr "La mise à jour incrémentale proposée exige %{space_needed}s d’espace libre sur la partition système de Tails, mais seulement %{free_space}s est libre." + +#: ../lib/Tails/IUK/Frontend.pm:336 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{memory_needed}s of free memory," +" but only %{free_memory}s is available." +msgstr "La mise à jour incrémentale proposée exige %{memory_needed}s de mémoire libre, mais seulement %{free_memory}s est libre." + +#: ../lib/Tails/IUK/Frontend.pm:358 +msgid "" +"An incremental upgrade is available, but no full upgrade is.\n" +"This should not happen. Please report a bug." +msgstr "Une mise à jour incrémentale est disponible, mais aucune mise à jour complète ne l’est.\nCela ne devrait pas arriver. Veuillez signaler un bogue." + +#: ../lib/Tails/IUK/Frontend.pm:362 +msgid "Error while detecting available upgrades" +msgstr "Erreur lors de la détection des mises à jour disponibles" + +#: ../lib/Tails/IUK/Frontend.pm:372 +#, perl-brace-format +msgid "" +"You should upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"We recommend you close all other applications during the upgrade.\n" +"Downloading the upgrade might take a long time, from several minutes to a few hours.\n" +"\n" +"Download size: %{size}s\n" +"\n" +"Do you want to upgrade now?" +msgstr "Vous devriez mettre à jour vers %{name}s %{version}s.\n\nPour plus de précisions sur cette nouvelle version, visitez %{details_url}s\n\nNous vous recommandons de fermer toutes les applications pendant la mise à jour.\nLe téléchargement de la mise à jour pourrait être long, de plusieurs minutes à quelques heures.\n\nTaille du téléchargement : %{size}s\n\nVoulez-vous mettre à jour maintenant ?" + +#: ../lib/Tails/IUK/Frontend.pm:386 +msgid "Upgrade available" +msgstr "Une mise à jour est disponible" + +#: ../lib/Tails/IUK/Frontend.pm:387 +msgid "Upgrade now" +msgstr "Mettre à jour maintenant" + +#: ../lib/Tails/IUK/Frontend.pm:388 +msgid "Upgrade later" +msgstr "Mettre à jour plus tard" + +#: ../lib/Tails/IUK/Frontend.pm:396 +#, perl-brace-format +msgid "" +"You should do a manual upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" +"\n" +"To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" +msgstr "Vous devriez mettre à niveau manuellement vers %{name}s %{version}s.\n\nPour plus d’informations sur cette nouvelle version, visitez %{details_url}s.\n\nIl n’est pas possible de mettre à niveau votre appareil automatiquement vers cette nouvelle version : %{explanation}s.\n\nPour apprendre à faire une mise à niveau manuelle, visitez https://tails.boum.org/doc/upgrade/#manual" + +#: ../lib/Tails/IUK/Frontend.pm:412 +msgid "New version available" +msgstr "Une nouvelle version est disponible" + +#: ../lib/Tails/IUK/Frontend.pm:469 +msgid "Downloading upgrade" +msgstr "Téléchargement de la mise à jour" + +#: ../lib/Tails/IUK/Frontend.pm:472 +#, perl-brace-format +msgid "Downloading the upgrade to %{name}s %{version}s..." +msgstr "Téléchargement de la mise à jour vers %{name}s %{version}s…" + +#: ../lib/Tails/IUK/Frontend.pm:513 +msgid "" +"The upgrade could not be downloaded.\\n\\nCheck your network " +"connection, and restart Tails to try upgrading again.\\n\\nIf the problem " +"persists, go to " +"file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "La mise à jour n’a pas pu être téléchargée.\\n\\nVérifiez votre connexion réseau et redémarrez Tails pour retenter de mettre à jour.\\n\\nSi le problème persiste, consultez file:///usr/share/doc/tails/website/doc/upgrade/error/download.fr.html" + +#: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548 +msgid "Error while downloading the upgrade" +msgstr "Erreur lors du téléchargement de la mise à jour" + +#: ../lib/Tails/IUK/Frontend.pm:541 +#, perl-brace-format +msgid "" +"Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " +"did not complain. Please report a bug." +msgstr "Le fichier de sortie '%{output_file}s' n’existe pas, mais tails-iuk-get-target-file ne s’en est pas plaint. Veuillez signaler un bogue." + +#: ../lib/Tails/IUK/Frontend.pm:560 +msgid "Error while creating temporary downloading directory" +msgstr "Erreur lors de la création du répertoire temporaire de téléchargement" + +#: ../lib/Tails/IUK/Frontend.pm:563 +msgid "Failed to create temporary download directory" +msgstr "Échec de création du répertoire temporaire de téléchargement" + +#: ../lib/Tails/IUK/Frontend.pm:587 +msgid "" +"Could not choose a download server.\n" +"\n" +"This should not happen. Please report a bug." +msgstr "Impossible de choisir un serveur de téléchargement.\n\nCela ne devrait pas arriver. Veuillez signaler un bogue." + +#: ../lib/Tails/IUK/Frontend.pm:591 +msgid "Error while choosing a download server" +msgstr "Erreur lors du choix d’un serveur de téléchargement" + +#: ../lib/Tails/IUK/Frontend.pm:606 +msgid "" +"The upgrade was successfully downloaded.\n" +"\n" +"The network connection will now be disabled.\n" +"\n" +"Please save your work and close all other applications." +msgstr "La mise à jour a été téléchargée avec succès.\n\nLa connexion réseau va être maintenant désactivée .\n\nVeuillez enregistrer vos travaux et fermer toutes autres applications." + +#: ../lib/Tails/IUK/Frontend.pm:612 +msgid "Upgrade successfully downloaded" +msgstr "La mise à jour a été téléchargée avec succès" + +#: ../lib/Tails/IUK/Frontend.pm:614 +msgid "Apply upgrade" +msgstr "Appliquer la mise à jour" + +#: ../lib/Tails/IUK/Frontend.pm:621 +msgid "" +"Your Tails device was successfully upgraded.\n" +"\n" +"Some security features were temporarily disabled.\n" +"You should restart Tails on the new version as soon as possible.\n" +"\n" +"Do you want to restart now?" +msgstr "Votre périphérique Tails a été mis à jour avec succès.\n\nQuelques fonctionnalités de sécurité ont été temporairement désactivées..\nVous devriez redémarrer Tails sur la nouvelle version dès que possible.\n\nVoulez-vous redémarrer maintenant ?" + +#: ../lib/Tails/IUK/Frontend.pm:626 +msgid "Restart Tails" +msgstr "Redémarrer Tails" + +#: ../lib/Tails/IUK/Frontend.pm:627 +msgid "Restart now" +msgstr "Redémarrer maintenant" + +#: ../lib/Tails/IUK/Frontend.pm:628 +msgid "Restart later" +msgstr "Redémarrer plus tard" + +#: ../lib/Tails/IUK/Frontend.pm:639 +msgid "Error while restarting the system" +msgstr "Erreur lors du redémarrage du système" + +#: ../lib/Tails/IUK/Frontend.pm:642 +msgid "Failed to restart the system" +msgstr "Échec de redémarrage du système" + +#: ../lib/Tails/IUK/Frontend.pm:657 +msgid "Error while shutting down the network" +msgstr "Erreur lors de l’arrêt du réseau" + +#: ../lib/Tails/IUK/Frontend.pm:660 +msgid "Failed to shutdown network" +msgstr "Échec d’arrêt du réseau" + +#: ../lib/Tails/IUK/Frontend.pm:670 +msgid "Upgrading the system" +msgstr "Mise à jour du système" + +#: ../lib/Tails/IUK/Frontend.pm:672 +msgid "" +"Your Tails device is being upgraded...\n" +"\n" +"For security reasons, the networking is now disabled." +msgstr "Votre périphérique Tails est en cours de mise à jour…\n\nPour des raisons de sécurité, le réseau est actuellement désactivé." + +#: ../lib/Tails/IUK/Frontend.pm:705 +msgid "" +"An error occured while installing the upgrade.\\n\\nYour Tails device" +" needs to be repaired and might be unable to restart.\\n\\nPlease follow the" +" instructions at " +"file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "Une erreur est survenue durant l’installation de la mise à jour.\\n\\nVotre périphérique Tails doit être réparé et pourrait ne pas redémarrer.\\n\\nVeuillez suivre les instructions sur file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html" + +#: ../lib/Tails/IUK/Frontend.pm:715 +msgid "Error while installing the upgrade" +msgstr "Erreur lors de l’installation de la mise à jour"

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit d9458103c469b8ef982672839f2ca995362a4d4b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 13:18:58 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 6d327560b..ea7ef8b2c 100644 --- a/fr.po +++ b/fr.po @@ -35,8 +35,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:17+0200\n" -"PO-Revision-Date: 2019-11-04 12:54+0000\n" -"Last-Translator: Kleber Blondel <tristanblond47(a)gmail.com>\n" +"PO-Revision-Date: 2019-11-20 13:06+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -158,7 +158,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" -msgstr "Vous devez réaliser une mise à niveau manuelle de %[name]s %[versions]s.\n\nPour plus d'informations sur cette nouvelle version, rendez-vous sur %[details_url]s\n\nIl est impossible de faire une mise à niveau automatique de votre système vers cette nouvelle version: %[explanation]s.\n\nPour savoir comment réaliser une mise à niveau manuelle, rendez-vous sur https://tails.boum.org/doc/upgrade/#manual" +msgstr "Vous devriez mettre à niveau manuellement vers %{name}s %{version}s.\n\nPour plus d’informations sur cette nouvelle version, visitez %{details_url}s.\n\nIl n’est pas possible de mettre à niveau votre appareil automatiquement vers cette nouvelle version : %{explanation}s.\n\nPour apprendre à faire une mise à niveau manuelle, visitez https://tails.boum.org/doc/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available"

1 0

[onionoo/master] Make inner classes static.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit bc0f0a6451372726fe4a018b7cecaf95c0f03709 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:19:53 2019 +0100 Make inner classes static. --- .../org/torproject/metrics/onionoo/server/ResourceServletTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index 9224620..ac3f107 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -45,7 +45,7 @@ public class ResourceServletTest { private static long TEST_TIME = DateTimeHelper.parse("2013-04-24 12:22:22"); - private class TestingHttpServletRequestWrapper + private static class TestingHttpServletRequestWrapper extends HttpServletRequestWrapper { private String requestUri; private String queryString; @@ -78,7 +78,7 @@ public class ResourceServletTest { } } - private class TestingHttpServletResponseWrapper extends + private static class TestingHttpServletResponseWrapper extends HttpServletResponseWrapper { private TestingHttpServletResponseWrapper() {

1 0

[onionoo/master] Remove deprecation warning.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit afe4045b50330bf0c65eeae393eeefebfa191817 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:16:03 2019 +0100 Remove deprecation warning. Class#newInstance is deprecated in Java 9 and higher, which doesn't affect us yet in Java 8. But the suggested replacement already works in Java 8, so that we can safely switch to that. --- .../java/org/torproject/metrics/onionoo/docs/DocumentStore.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 778bab9..2963db2 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -524,9 +524,9 @@ public class DocumentStore { Class<T> documentType, String documentString) { T result = null; try { - result = documentType.newInstance(); + result = documentType.getDeclaredConstructor().newInstance(); result.setFromDocumentString(documentString); - } catch (InstantiationException | IllegalAccessException e) { + } catch (ReflectiveOperationException e) { /* Handle below. */ log.error(e.getMessage(), e); } @@ -558,9 +558,9 @@ public class DocumentStore { Class<T> documentType, String documentString) { T result = null; try { - result = documentType.newInstance(); + result = documentType.getDeclaredConstructor().newInstance(); result.setDocumentString(documentString); - } catch (InstantiationException | IllegalAccessException e) { + } catch (ReflectiveOperationException e) { /* Handle below. */ log.error(e.getMessage(), e); }

1 0

[onionoo/master] Use StandardCharsets.US_ASCII instead of "US-ASCII".
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 4521ad33ba8a7eddfc3ee999aeb1bb46ef0fd859 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:14:53 2019 +0100 Use StandardCharsets.US_ASCII instead of "US-ASCII". --- src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 2963db2..78c0baa 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -20,6 +20,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -482,7 +483,7 @@ public class DocumentStore { /* Document file is empty. */ return null; } - documentString = new String(allData, "US-ASCII"); + documentString = new String(allData, StandardCharsets.US_ASCII); this.retrievedFiles++; this.retrievedBytes += documentString.length(); } catch (IOException e) { @@ -765,7 +766,7 @@ public class DocumentStore { throws IOException { try (BufferedOutputStream bos = new BufferedOutputStream( new FileOutputStream(file))) { - bos.write(content.getBytes("US-ASCII")); + bos.write(content.getBytes(StandardCharsets.US_ASCII)); } }

1 0

[onionoo/master] Avoid unnecessary conversions to String.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 09765ef24569d72666843440ae2a7225c2b38ac5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:17:56 2019 +0100 Avoid unnecessary conversions to String. --- .../java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java | 4 ++-- src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java | 4 ++-- .../java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java | 3 +-- .../java/org/torproject/metrics/onionoo/updater/LookupService.java | 2 +- .../org/torproject/metrics/onionoo/server/ResourceServletTest.java | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java index 6466b63..c9eddf1 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java @@ -173,12 +173,12 @@ public class BandwidthStatus extends Document { for (long[] v : writeHistory.values()) { sb.append("w ").append(DateTimeHelper.format(v[0])).append(" ") .append(DateTimeHelper.format(v[1])).append(" ") - .append(String.valueOf(v[2])).append("\n"); + .append(v[2]).append("\n"); } for (long[] v : readHistory.values()) { sb.append("r ").append(DateTimeHelper.format(v[0])).append(" ") .append(DateTimeHelper.format(v[1])).append(" ") - .append(String.valueOf(v[2])).append("\n"); + .append(v[2]).append("\n"); } return sb.toString(); } diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java index 826db9e..1294bd5 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java @@ -724,11 +724,11 @@ public class NodeStatus extends Document { sb.append("\t").append(this.dirPort).append("\t"); sb.append(StringUtils.join(this.getRelayFlags(), ",")); if (this.isRelay) { - sb.append("\t").append(String.valueOf(this.consensusWeight)); + sb.append("\t").append(this.consensusWeight); sb.append("\t") .append((this.countryCode != null ? this.countryCode : "??")); sb.append("\t"); /* formerly used for storing host names */ - sb.append("\t").append(String.valueOf(this.lastRdnsLookup)); + sb.append("\t").append(this.lastRdnsLookup); sb.append("\t").append((this.defaultPolicy != null ? this.defaultPolicy : "null")); sb.append("\t").append((this.portList != null ? this.portList : "null")); diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java index 6cae37e..c609b2a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java @@ -124,8 +124,7 @@ class DescriptorQueue { for (Map.Entry<String, Long> e : excludedAndParsedFiles.entrySet()) { String absolutePath = e.getKey(); long lastModifiedMillis = e.getValue(); - bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath - + "\n"); + bw.write(lastModifiedMillis + " " + absolutePath + "\n"); } } catch (IOException e) { log.error("Could not write history file '{}'. Not excluding descriptors " diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index 947c78c..63fcaa8 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -248,7 +248,7 @@ public class LookupService { this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); return lookupResults; } - String asNumber = "AS" + String.valueOf(Integer.parseInt(parts[1])); + String asNumber = "AS" + Integer.parseInt(parts[1]); String asName = parts[2]; while (firstAddressNumber < startIpNum && firstAddressNumber != -1L) { diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index 7df56ea..9224620 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -1358,7 +1358,7 @@ public class ResourceServletTest { @Test(timeout = 100) public void testFirstSeenDaysMaxInt() { this.assertSummaryDocument( - "/summary?last_seen_days=" + String.valueOf(Integer.MAX_VALUE), 0, + "/summary?last_seen_days=" + Integer.MAX_VALUE, 0, null, 0, null); } @@ -1366,7 +1366,7 @@ public class ResourceServletTest { public void testFirstSeenDaysMaxIntPlusOne() { this.assertErrorStatusCode( "/summary?first_seen_days=" - + String.valueOf(((long) Integer.MAX_VALUE) + 1L), 400); + + (((long) Integer.MAX_VALUE) + 1L), 400); } @Test(timeout = 100)

1 0

[onionoo/master] Avoid unnecessary cast.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 5ad9518d8b31a84bbf125d0c7256767d027664ce Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:20:10 2019 +0100 Avoid unnecessary cast. --- .../org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java index c9daf92..fdaa39c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java @@ -83,7 +83,7 @@ public class ClientsStatusUpdater implements DescriptorListener, * include in a clients document. */ return; } - double okResponses = (double) (responses.get("ok") - 4); + double okResponses = responses.get("ok") - 4; if (okResponses < 0.0) { /* Response numbers are not supposed to be negative. Skipping. */ return;

1 0

[onionoo/master] Simplify getStatsString methods.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit f0530196ab111ebad5862561b6617346fb52a256 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:36:18 2019 +0100 Simplify getStatsString methods. --- .../metrics/onionoo/docs/DocumentStore.java | 32 ++++++++++------------ .../onionoo/updater/ClientsStatusUpdater.java | 13 ++++----- .../metrics/onionoo/updater/LookupService.java | 11 ++++---- .../onionoo/updater/NodeDetailsStatusUpdater.java | 10 +++---- .../onionoo/updater/UptimeStatusUpdater.java | 18 +++++------- .../onionoo/writer/ClientsDocumentWriter.java | 6 ++-- .../onionoo/writer/SummaryDocumentWriter.java | 10 +++---- .../onionoo/writer/UptimeDocumentWriter.java | 6 ++-- 8 files changed, 43 insertions(+), 63 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 78c0baa..9489cba 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -817,24 +817,20 @@ public class DocumentStore { /** Returns a string with statistics on document storage operations. */ public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ") - .append(FormattingUtils.formatDecimalNumber(listOperations)) - .append(" list operations performed\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber(listedFiles)) - .append(" files listed\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber(storedFiles)) - .append(" files stored\n"); - sb.append(" ").append(FormattingUtils.formatBytes(storedBytes)) - .append(" stored\n"); - sb.append(" ") - .append(FormattingUtils.formatDecimalNumber(retrievedFiles)) - .append(" files retrieved\n"); - sb.append(" ").append(FormattingUtils.formatBytes(retrievedBytes)) - .append(" retrieved\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber(removedFiles)) - .append(" files removed\n"); - return sb.toString(); + return String.format(" %s list operations performed\n" + + " %s files listed\n" + + " %s files stored\n" + + " %s stored\n" + + " %s files retrieved\n" + + " %s retrieved\n" + + " %s files removed\n", + FormattingUtils.formatDecimalNumber(listOperations), + FormattingUtils.formatDecimalNumber(listedFiles), + FormattingUtils.formatDecimalNumber(storedFiles), + FormattingUtils.formatBytes(storedBytes), + FormattingUtils.formatDecimalNumber(retrievedFiles), + FormattingUtils.formatBytes(retrievedBytes), + FormattingUtils.formatDecimalNumber(removedFiles)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java index fdaa39c..07dfb85 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java @@ -172,14 +172,11 @@ public class ClientsStatusUpdater implements DescriptorListener, for (SortedSet<ClientsHistory> hist : this.newResponses.values()) { newIntervals += hist.size(); } - StringBuilder sb = new StringBuilder(); - sb.append(" ") - .append(FormattingUtils.formatDecimalNumber(newIntervals / 2)) - .append(" client statistics processed from extra-info descriptors\n"); - sb.append(" ") - .append(FormattingUtils.formatDecimalNumber(this.newResponses.size())) - .append(" client status files updated\n"); - return sb.toString(); + return String.format( + " %s client statistics processed from extra-info descriptors\n" + + " %s client status files updated\n", + FormattingUtils.formatDecimalNumber(newIntervals / 2), + FormattingUtils.formatDecimalNumber(this.newResponses.size())); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index 63fcaa8..9e97487 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -358,12 +358,11 @@ public class LookupService { /** Returns a string with the number of addresses looked up and * resolved. */ public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - addressesLookedUp)).append(" addresses looked up\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - addressesResolved)).append(" addresses resolved\n"); - return sb.toString(); + return String.format( + " %s addresses looked up\n" + + " %s addresses resolved\n", + FormattingUtils.formatDecimalNumber(addressesLookedUp), + FormattingUtils.formatDecimalNumber(addressesResolved)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index b25459d..9718202 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -951,12 +951,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - relayConsensusesProcessed)).append(" relay consensuses processed\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - bridgeStatusesProcessed)).append(" bridge statuses processed\n"); - return sb.toString(); + return String.format(" %s relay consensuses processed\n" + + " %s bridge statuses processed\n", + FormattingUtils.formatDecimalNumber(relayConsensusesProcessed), + FormattingUtils.formatDecimalNumber(bridgeStatusesProcessed)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java index 584d24d..1f9f960 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java @@ -176,17 +176,13 @@ public class UptimeStatusUpdater implements DescriptorListener, @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.newRelayStatuses.size())).append(" hours of relay uptimes ") - .append("processed\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.newBridgeStatuses.size())).append(" hours of bridge uptimes ") - .append("processed\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.newRunningRelays.size() + this.newRunningBridges.size())) - .append(" uptime status files updated\n"); - return sb.toString(); + return String.format(" %s hours of relay uptimes processed\n" + + " %s hours of bridge uptimes processed\n" + + " %s uptime status files updated\n", + FormattingUtils.formatDecimalNumber(this.newRelayStatuses.size()), + FormattingUtils.formatDecimalNumber(this.newBridgeStatuses.size()), + FormattingUtils.formatDecimalNumber( + this.newRunningRelays.size() + this.newRunningBridges.size())); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java index b1406ac..e253d22 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java @@ -113,10 +113,8 @@ public class ClientsDocumentWriter implements DocumentWriter { @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.writtenDocuments)).append(" clients document files updated\n"); - return sb.toString(); + return String.format(" %s clients document files updated\n", + FormattingUtils.formatDecimalNumber(this.writtenDocuments)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java index 0103c31..997fe40 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java @@ -113,12 +113,10 @@ public class SummaryDocumentWriter implements DocumentWriter { @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.writtenDocuments)).append(" summary document files written\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.deletedDocuments)).append(" summary document files deleted\n"); - return sb.toString(); + return String.format(" %s summary document files written\n" + + " %s summary document files deleted\n", + FormattingUtils.formatDecimalNumber(this.writtenDocuments), + FormattingUtils.formatDecimalNumber(this.deletedDocuments)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java index fc9b08a..e2a0f63 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java @@ -238,10 +238,8 @@ public class UptimeDocumentWriter implements DocumentWriter { @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.writtenDocuments)).append(" uptime document files written\n"); - return sb.toString(); + return String.format(" %s uptime document files written\n", + FormattingUtils.formatDecimalNumber(this.writtenDocuments)); } }

1 0