January 2020 - tor-commits - lists.torproject.org

[gettor/master] Update send mail to get user requested locale
by cohosh＠torproject.org 31 Jan '20

31 Jan '20

commit 56399f5a71f7ebc642ab5ba9526f4da716a83771 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 31 09:53:32 2020 -0500 Update send mail to get user requested locale This updates sendmail to get links and save stats for the user requested locale. Right now all body translations default to english since we haven't translated it yet. --- gettor/services/email/sendmail.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index c570f22..8d895d7 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -215,15 +215,15 @@ class Sendmail(object): locales = strings.get_locales() strings.load_strings(language) - locale = locales[language]['locale'] + locale = locales['en']['locale'] - log.info("Getting links for {}.".format(platform)) + log.info("Getting links for {} {}.".format(platform, language)) links = yield self.conn.get_links( - platform=platform, language=locale, status="ACTIVE" + platform=platform, language=language, status="ACTIVE" ) # build message - link_msg, file = self.build_link_strings(links, platform, locale) + link_msg, file = self.build_link_strings(links, platform, language) body_msg = self.build_body_message(link_msg, platform, file) subject_msg = strings._("links_subject") @@ -241,7 +241,7 @@ class Sendmail(object): ) yield self.conn.update_stats( - command="links", platform=platform, language=locale, + command="links", platform=platform, language=language, service="email" )

1 0

[gettor/master] Update help message to allow locales
by cohosh＠torproject.org 31 Jan '20

31 Jan '20

commit 3dfc2fdbaa3f8467d8c49977b08256f12149daf4 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 31 11:52:23 2020 -0500 Update help message to allow locales The only help message urged users to only specify 'en' as a locale. We now support all locales for tor browser binaries. --- share/locale/en.json | 2 +- share/locale/es.json | 2 +- share/locale/pt.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/locale/en.json b/share/locale/en.json index 8e90cdd..dba3047 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -9,7 +9,7 @@ "links_subject": "[GetTor] Links for your request", "help_body_intro": "This is how you can request a tor browser bundle link.\n\n", "help_body_paragraph": "Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\n", - "help_body_support": "We only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", + "help_body_support": "We only support windows, osx and linux as operating systems.\n\n", "help_subject": "[GetTor] Help Email", "help_debug": "Log application errors to stdout", "help_config": "Custom config file location (optional)", diff --git a/share/locale/es.json b/share/locale/es.json index 8e90cdd..dba3047 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -9,7 +9,7 @@ "links_subject": "[GetTor] Links for your request", "help_body_intro": "This is how you can request a tor browser bundle link.\n\n", "help_body_paragraph": "Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\n", - "help_body_support": "We only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", + "help_body_support": "We only support windows, osx and linux as operating systems.\n\n", "help_subject": "[GetTor] Help Email", "help_debug": "Log application errors to stdout", "help_config": "Custom config file location (optional)", diff --git a/share/locale/pt.json b/share/locale/pt.json index 8e90cdd..dba3047 100644 --- a/share/locale/pt.json +++ b/share/locale/pt.json @@ -9,7 +9,7 @@ "links_subject": "[GetTor] Links for your request", "help_body_intro": "This is how you can request a tor browser bundle link.\n\n", "help_body_paragraph": "Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\n", - "help_body_support": "We only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", + "help_body_support": "We only support windows, osx and linux as operating systems.\n\n", "help_subject": "[GetTor] Help Email", "help_debug": "Log application errors to stdout", "help_config": "Custom config file location (optional)",

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 31 Jan '20

31 Jan '20

commit 059111cdac925c2f7ef74c44f39b1664ed38d531 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 18:48:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pt_PT.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_PT.po b/pt_PT.po index a0c288b094..4b8d2f75e3 100644 --- a/pt_PT.po +++ b/pt_PT.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Hugo9191 <hugoncosta(a)gmail.com>, 2019 +# Hugo9191 <hugoncosta(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2018 # Nuno Rego <nuno.rego(a)outlook.com>, 2019 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-06 13:47+0000\n" -"Last-Translator: Rui <xymarior(a)yandex.com>\n" +"PO-Revision-Date: 2020-01-31 18:18+0000\n" +"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 31 Jan '20

31 Jan '20

commit b9790bda687043f7fd4912bfeacb9bc34da906e4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 18:47:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- pt_PT.po | 104 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/pt_PT.po b/pt_PT.po index cd87929c29..7eedbe36b9 100644 --- a/pt_PT.po +++ b/pt_PT.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Hugo9191 <hugoncosta(a)gmail.com>, 2019 +# Hugo9191 <hugoncosta(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2018 # Nuno Rego <nuno.rego(a)outlook.com>, 2019 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-06 13:47+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-01-31 18:18+0000\n" +"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -106,7 +106,7 @@ msgstr "_Sair" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "" +msgstr "Para obter informação de depuração de erros, execute o seguinte comando: sudo tails-debugging-info" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:244 msgid "" @@ -115,15 +115,15 @@ msgid "" "website.\\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/check.en.html" -msgstr "" +msgstr "Ocorreu um erro ao atualizar a chave de assinatura.\\n\\nIsto previne determinar se existe uma atualização do nosso website.\\n\\nConfirme a sua ligação à rede, e reinicie o Tails para tentar atualziar novamente.\\n\\nSe o problema persistir, vá a file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250 msgid "Error while updating the signing key" -msgstr "" +msgstr "Erro ao atualizar a chave de assinatura!" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279 msgid "Error while checking for upgrades" -msgstr "" +msgstr "Erro enquanto pesquisava por atualizações" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:282 msgid "" @@ -132,64 +132,64 @@ msgid "" "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 "" +msgstr "Não foi possível determinar se existe uma atualização disponível no nosso sítio da Web.\n\nVerifique a sua ligação de rede e reinicie o Tails para tentar atualizar novamente.\n\nSe o problema persistir, utilize o ficheiro file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:297 msgid "no automatic upgrade is available from our website for this version" -msgstr "" +msgstr "não está disponível nenhuma atualização automática no nosso sítio da web para esta versão" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:303 msgid "your device was not created using a USB image or Tails Installer" -msgstr "" +msgstr "o seu dispositivo não foi criado utilizando uma imagem USB ou o Instalador do Tails" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:308 msgid "Tails was started from a DVD or a read-only device" -msgstr "" +msgstr "O Tails foi iniciado a partir de um DVD ou de um dispositivo só de leitura" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:313 msgid "there is not enough free space on the Tails system partition" -msgstr "" +msgstr "não existe espaço suficiente na partição do sistema Tails" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:318 msgid "not enough memory is available on this system" -msgstr "" +msgstr "não tem disponível memória suficiente neste sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:324 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "" +msgstr "Nenhuma explicação disponível para o erro '%{reason}s'." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:345 msgid "The system is up-to-date" -msgstr "" +msgstr "O sistema está atualizado" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:350 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +msgstr "Esta versão do Tails está desatualizada, e poderá ter problemas de segurança." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:382 #, 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 "" +msgstr "A atualização disponível requer %{space_needed}s de espaço livre na partição de sistema Tails, mas está disponível apenas %{free_space}s." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:398 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "" +msgstr "A atualização disponível requer %{memory_needed}s de memória livre, só está disponível %{free_memory}s." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:420 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Está disponível uma atualização incremental, mas a atualização total não.\nIsto não devia acontecer. Por favor reporte o erro." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:424 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Erro enquanto detetava as atualizações disponíveis" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:434 #, perl-brace-format @@ -204,19 +204,19 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "Deve atualizar para o %{name}s %{version}s.\n\nPara mis informações sobre esta versão, aceda a %{details_url}s\n\nRecomendamos que feche todos os outros programas abertos durante a atualização.\nPode demorar algum tempo o descarregamento da atualização, desde a alguns minutos até horas.\n\nTamanho do descarregamento: %{size}s\n\nQuer atualizar agora?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:448 msgid "Upgrade available" -msgstr "" +msgstr "Atualização disponível" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:449 msgid "Upgrade now" -msgstr "" +msgstr "Atualizar Agora" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:450 msgid "Upgrade later" -msgstr "" +msgstr "Atualizar Mais Tarde" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:458 #, perl-brace-format @@ -228,20 +228,20 @@ 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 "" +msgstr "Devia atualizar manualmente para o %{name}s %{version}s.\n\nPara mais informação sobre esta nova versão aceda a %{details_url}s\n\nNão é possível atualizar automaticamente o seu dispositivo para esta nova versão: %{explanation}s.\n\nPara saber como atualizar manualmente, aceda a https://tails.boum.org/doc/upgrade/#manual" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:474 msgid "New version available" -msgstr "" +msgstr "Disponível Nova Versão" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:555 msgid "Downloading upgrade" -msgstr "" +msgstr "A transferir a atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:558 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +msgstr "A transferir a atualização para %{name}s %{version}s..." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:599 msgid "" @@ -249,38 +249,38 @@ msgid "" "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 "" +msgstr "Não foi possível transferir a atualização.\\n\\nVerifique a sua ligação de rede, e reinicie o Tails para tentar atualizar novamente.\\n\\nSe o problema persistir, utilize file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:615 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:634 msgid "Error while downloading the upgrade" -msgstr "" +msgstr "Erro durante a transferência da atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:627 #, 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 "" +msgstr "O ficheiro de saída file '%{output_file}s' não existe, mas o tails-iuk-get-target-file não se queixou. Por favor reporte o erro." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:646 msgid "Error while creating temporary downloading directory" -msgstr "" +msgstr "Erro enquanto criava a pasta temporária da transferência" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:649 msgid "Failed to create temporary download directory" -msgstr "" +msgstr "Não foi possível criar a pasta temporária da transferência" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:673 msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Não foi possível escolher o servidor de descarregamento.\n\nIsto não deveria acontecer. Por favor, comunique um erro." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:677 msgid "Error while choosing a download server" -msgstr "" +msgstr "Erro ao escolher o servidor de descarregamento" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -289,15 +289,15 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "A atualização foi descarregada com sucesso.\n\nA ligação à rede será agora desligada.\n\nPor favor guarde o seu trabalho e feche todos os programas." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:698 msgid "Upgrade successfully downloaded" -msgstr "" +msgstr "Atualização descarregada com sucesso" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700 msgid "Apply upgrade" -msgstr "" +msgstr "Aplicar atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:707 msgid "" @@ -307,46 +307,46 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "" +msgstr "O seu dispositivo Tails foi atualizado com sucesso.\n\nAlgumas funcionalidades de segurança foram temporariamente desativadas.\nDeve reiniciar o Tails na nova versão o mais breve possível.\n\nDeseja reiniciar agora?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:712 msgid "Restart Tails" -msgstr "" +msgstr "Reiniciar Tails" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:713 msgid "Restart now" -msgstr "" +msgstr "Reiniciar Agora" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:714 msgid "Restart later" -msgstr "" +msgstr "Reiniciar Mais Tarde" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:725 msgid "Error while restarting the system" -msgstr "" +msgstr "Erro enquanto reiniciava o sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:728 msgid "Failed to restart the system" -msgstr "" +msgstr "Não foi possível reiniciar o sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:743 msgid "Error while shutting down the network" -msgstr "" +msgstr "Erro enquanto desligava a rede" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:746 msgid "Failed to shutdown network" -msgstr "" +msgstr "Não foi possível desligar a rede" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:753 msgid "Upgrading the system" -msgstr "" +msgstr "A atualizar o sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:755 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "" +msgstr "O seu dispositivo Tails está a ser atualizado...\n\nPor razões de segurança, a rede foi desativada." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:788 msgid "" @@ -354,11 +354,11 @@ msgid "" " 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 "" +msgstr "Ocorreu um erro durante a instalação da atualização.\\n\\nO seu dispositivo Tails necessita de ser reparado e pode não conseguir reiniciar.\\n\\nPor favor siga as instruções em file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:798 msgid "Error while installing the upgrade" -msgstr "" +msgstr "Erro enquanto instalava a atualização" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32 msgid "Additional Settings" @@ -519,13 +519,13 @@ msgstr "Erro" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "" +msgstr "O dispositivo Tails que está a ser executado não pode ser encontrado. Talvez tenha utilizado a opção 'toram'?" #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:253 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "" +msgstr "A unidade Tails está a ser executada não pode ser encontrada. Talvez tenha utilizado a opção 'toram'?" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen"

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 31 Jan '20

31 Jan '20

commit d719a527ac157010b495c2bb575cdc529669a492 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 18:16:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- pt_PT/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pt_PT/https-everywhere.dtd b/pt_PT/https-everywhere.dtd index 039721efc0..da4c13d46c 100644 --- a/pt_PT/https-everywhere.dtd +++ b/pt_PT/https-everywhere.dtd @@ -29,6 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed ""> <!ENTITY https-everywhere.options.disabledUrlsListed ""> <!ENTITY https-everywhere.options.updateChannelsWarning ""> +<!ENTITY https-everywhere.options.addDisabledSite ""> +<!ENTITY https-everywhere.options.enterDisabledSite ""> <!ENTITY https-everywhere.options.addUpdateChannel ""> <!ENTITY https-everywhere.options.enterUpdateChannelName ""> <!ENTITY https-everywhere.options.delete "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 31 Jan '20

31 Jan '20

commit 4c4f88d45ab408147e7ed94f28dc7291e2dd6661 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 18:15:57 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- pt_PT/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_PT/https-everywhere.dtd b/pt_PT/https-everywhere.dtd index 8e39dd2046..28f008a2cc 100644 --- a/pt_PT/https-everywhere.dtd +++ b/pt_PT/https-everywhere.dtd @@ -29,8 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere - Regras do utilizador"> <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere - Sites desativados"> <!ENTITY https-everywhere.options.updateChannelsWarning "Aviso: adicionar canais de atualização pode fazer com que atacantes tomem conta do seu navegador de Internet. Edite esta secção apenas se souber o que está a fazer!"> -<!ENTITY https-everywhere.options.addDisabledSite "Add Disabled Site"> -<!ENTITY https-everywhere.options.enterDisabledSite "Enter disabled site"> +<!ENTITY https-everywhere.options.addDisabledSite "Adicionar Website Desativado"> +<!ENTITY https-everywhere.options.enterDisabledSite "Adicione Website Desativado"> <!ENTITY https-everywhere.options.addUpdateChannel "Adicionar canais de atualização"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Introduza o nome do canal de atualização"> <!ENTITY https-everywhere.options.delete "Eliminar">

1 0

[gettor/master] Modified email parser to get locales from db
by cohosh＠torproject.org 31 Jan '20

31 Jan '20

commit 187e27da768d9fda5033da03b6c922a0baaa5d0c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 24 17:26:55 2020 -0500 Modified email parser to get locales from db Before we were conflating the locales for the tor browser binaries with the available locale for gettor email body localizations. This patch checks our links database for available locales. --- gettor/parse/email.py | 19 ++++++++++++++----- gettor/utils/db.py | 8 ++++++++ scripts/process_email | 1 + tests/test.conf.json | 2 +- tests/test_email_service.py | 11 +++++++++-- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 4629b7c..56b91bf 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -56,6 +56,7 @@ class EmailParser(object): self.settings = settings self.dkim = dkim self.to_addr = to_addr + self.locales = [] def normalize(self, msg): # Normalization will convert <Alice Wonderland> alice(a)wonderland.net @@ -112,7 +113,7 @@ class EmailParser(object): return True - def build_request(self, msg_str, norm_addr, languages, platforms): + def build_request(self, msg_str, norm_addr, platforms): # Search for commands keywords subject_re = re.compile(r"Subject: (.*)\r\n") subject = subject_re.search(msg_str) @@ -128,7 +129,7 @@ class EmailParser(object): if subject: subject = subject.group(1) for word in re.split(r"\s+", subject.strip()): - if word.lower() in languages: + if word.lower() in self.locales: request["language"] = word.lower() if word.lower() in platforms: request["command"] = "links" @@ -139,7 +140,7 @@ class EmailParser(object): if not request["command"] or not request["language"]: for word in re.split(r"\s+", msg_str.strip()): - if word.lower() in languages: + if word.lower() in self.locales: request["language"] = word.lower() if word.lower() in platforms: request["command"] = "links" @@ -159,6 +160,15 @@ class EmailParser(object): else: return True + @defer.inlineCallbacks + def get_locales(self): + dbname = self.settings.get("dbname") + conn = SQLite3(dbname) + + locales = yield conn.get_locales() + for l in locales: + self.locales.append(l[0]) + def parse(self, msg_str): """ @@ -177,7 +187,6 @@ class EmailParser(object): log.msg("Building email message from string.", system="email parser") platforms = self.settings.get("platforms") - languages = [*strings.get_locales().keys()] msg = message_from_string(msg_str) name, norm_addr, to_name, norm_to_addr = self.normalize(msg) @@ -203,7 +212,7 @@ class EmailParser(object): except ValueError as e: log.msg("DKIM error: {}".format(e.args)) - request = self.build_request(msg_str, norm_addr, languages, platforms) + request = self.build_request(msg_str, norm_addr, platforms) return request diff --git a/gettor/utils/db.py b/gettor/utils/db.py index 525287b..1ccdf8e 100644 --- a/gettor/utils/db.py +++ b/gettor/utils/db.py @@ -104,3 +104,11 @@ class SQLite3(object): return self.dbpool.runQuery( query, (platform, language, status) ).addCallback(self.query_callback).addErrback(self.query_errback) + + def get_locales(self): + """ + Get a list of the supported tor browser binary locales + """ + query = "SELECT DISTINCT language FROM links" + return self.dbpool.runQuery(query + ).addCallback(self.query_callback).addErrback(self.query_errback) diff --git a/scripts/process_email b/scripts/process_email index 37c4e0b..cce7bcc 100755 --- a/scripts/process_email +++ b/scripts/process_email @@ -28,6 +28,7 @@ def process_email(message): try: ep = EmailParser(settings, "gettor(a)torproject.org") + yield ep.get_locales().addErrback(ep.parse_errback) yield defer.maybeDeferred( ep.parse, message ).addCallback(ep.parse_callback).addErrback(ep.parse_errback) diff --git a/tests/test.conf.json b/tests/test.conf.json index 8f296cc..03bbaf6 100644 --- a/tests/test.conf.json +++ b/tests/test.conf.json @@ -1,6 +1,6 @@ { "platforms": ["linux", "osx", "windows"], - "dbname": "gettor.db", + "dbname": "tests/gettor.db", "email_parser_logfile": "email_parser.log", "email_requests_limit": 30, "twitter_requests_limit": 1, diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 187711e..5fa87fc 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -65,9 +65,9 @@ class EmailServiceTests(unittest.TestCase): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") msg_str = "From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\r\n osx es" msg = conftests.message_from_string(msg_str) - languages = [*self.locales.keys()] platforms = self.settings.get('platforms') - request = ep.build_request(msg_str, "hiro(a)torproject.org", languages, platforms) + ep.locales = ["es", "en"] + request = ep.build_request(msg_str, "hiro(a)torproject.org", platforms) self.assertEqual(request["command"], "links") self.assertEqual(request["platform"], "osx") self.assertEqual(request["language"], "es") @@ -83,11 +83,18 @@ class EmailServiceTests(unittest.TestCase): def test_language_email_parser(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + ep.locales = ["en", "ru"] request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n osx en") self.assertEqual(request["command"], "links") self.assertEqual(request["platform"], "osx") self.assertEqual(request["language"], "en") + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n linux ru") + self.assertEqual(request["command"], "links") + self.assertEqual(request["platform"], "linux") + self.assertEqual(request["language"], "ru") + + def test_sent_links_message(self): ep = self.sm_client links = self.links

1 0

[gettor/master] Make locale parser more robust
by cohosh＠torproject.org 31 Jan '20

31 Jan '20

commit 277ba71b466332b4b8bd4752a2c46c5bcb9cf71c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 27 10:17:29 2020 -0500 Make locale parser more robust This change expands the locale parse to have the following properties: - if only the language code is given, choses the regionalization that occurs first in the locale list (e.g., "en" --> "en-US" - if regionalization for the language is *not* present, choses the generalized language or a different regionalization (e.g. "pt-PT" --> "pt-BR") - parses both the subject and body looking for the most specific regionalization - defaults to en-US if no available language is found --- gettor/parse/email.py | 15 ++++++++--- tests/test_email_service.py | 66 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 15 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index d487684..874b1cd 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -116,8 +116,12 @@ class EmailParser(object): def parse_keywords(self, text, request): for word in re.split(r"\s+", text.strip()): - if word.lower() in self.locales: - request["language"] = word.lower() + for locale in self.locales: + if word.lower() == locale.lower(): + request["language"] = locale + elif (not request["language"]) and (word.lower()[:2] == + locale.lower()[:2]): + request["language"] = locale if word.lower() in self.platforms: request["command"] = "links" request["platform"] = word.lower() @@ -143,8 +147,11 @@ class EmailParser(object): subject = subject.group(1) request = self.parse_keywords(subject, request) - if not request["command"] or not request["language"]: - request = self.parse_keywords(msg_str, request) + # Always parse the body too, to see if there's more specific information + request = self.parse_keywords(msg_str, request) + + if not request["language"]: + request["language"] = "en-US" return request diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 407937c..00795c1 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -82,17 +82,61 @@ class EmailServiceTests(unittest.TestCase): def test_language_email_parser(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") - ep.locales = ["en", "ru"] - request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n osx en") - self.assertEqual(request["command"], "links") - self.assertEqual(request["platform"], "osx") - self.assertEqual(request["language"], "en") - - request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n linux ru") - self.assertEqual(request["command"], "links") - self.assertEqual(request["platform"], "linux") - self.assertEqual(request["language"], "ru") - + ep.locales = ["en-US", "es-ES", "es-AR", "pt-BR", "fa"] + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n osx en") + self.assertEqual(request["language"], "en-US") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n osx ES") + self.assertEqual(request["language"], "es-ES") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n osx en-US") + self.assertEqual(request["language"], "en-US") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n linux fa") + self.assertEqual(request["language"], "fa") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n osx es") + self.assertEqual(request["language"], "es-ES") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n linux zz") + self.assertEqual(request["language"], "en-US") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n linux pt-PT") + self.assertEqual(request["language"], "pt-BR") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: \r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n linux es-AR") + self.assertEqual(request["language"], "es-AR") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: linux es\r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n linux es-AR") + self.assertEqual(request["language"], "es-AR") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: linux es\r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n linux") + self.assertEqual(request["language"], "es-ES") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: linux es-AR\r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n linux es") + self.assertEqual(request["language"], "es-AR") def test_sent_links_message(self): ep = self.sm_client

1 0

[gettor/master] Refactor email keyword parser
by cohosh＠torproject.org 31 Jan '20

31 Jan '20

commit 4fa4d6368c3c8dd40090196c6ff1cebb9c2ad5e7 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 27 09:58:26 2020 -0500 Refactor email keyword parser This commit refactors build_request to prevent duplicate code. It also moves the platforms definition to the parser constructor. --- gettor/parse/email.py | 38 +++++++++++++++++--------------------- tests/test_email_service.py | 3 +-- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 56b91bf..d487684 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -57,6 +57,7 @@ class EmailParser(object): self.dkim = dkim self.to_addr = to_addr self.locales = [] + self.platforms = self.settings.get("platforms") def normalize(self, msg): # Normalization will convert <Alice Wonderland> alice(a)wonderland.net @@ -112,8 +113,20 @@ class EmailParser(object): else: return True + def parse_keywords(self, text, request): + + for word in re.split(r"\s+", text.strip()): + if word.lower() in self.locales: + request["language"] = word.lower() + if word.lower() in self.platforms: + request["command"] = "links" + request["platform"] = word.lower() + if word.lower() == "help": + request["command"] = "help" + break + return request - def build_request(self, msg_str, norm_addr, platforms): + def build_request(self, msg_str, norm_addr): # Search for commands keywords subject_re = re.compile(r"Subject: (.*)\r\n") subject = subject_re.search(msg_str) @@ -128,26 +141,10 @@ class EmailParser(object): if subject: subject = subject.group(1) - for word in re.split(r"\s+", subject.strip()): - if word.lower() in self.locales: - request["language"] = word.lower() - if word.lower() in platforms: - request["command"] = "links" - request["platform"] = word.lower() - if word.lower() == "help": - request["command"] = "help" - break + request = self.parse_keywords(subject, request) if not request["command"] or not request["language"]: - for word in re.split(r"\s+", msg_str.strip()): - if word.lower() in self.locales: - request["language"] = word.lower() - if word.lower() in platforms: - request["command"] = "links" - request["platform"] = word.lower() - if word.lower() == "help": - request["command"] = "help" - break + request = self.parse_keywords(msg_str, request) return request @@ -186,7 +183,6 @@ class EmailParser(object): log.msg("Building email message from string.", system="email parser") - platforms = self.settings.get("platforms") msg = message_from_string(msg_str) name, norm_addr, to_name, norm_to_addr = self.normalize(msg) @@ -212,7 +208,7 @@ class EmailParser(object): except ValueError as e: log.msg("DKIM error: {}".format(e.args)) - request = self.build_request(msg_str, norm_addr, platforms) + request = self.build_request(msg_str, norm_addr) return request diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 5fa87fc..407937c 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -65,9 +65,8 @@ class EmailServiceTests(unittest.TestCase): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") msg_str = "From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\r\n osx es" msg = conftests.message_from_string(msg_str) - platforms = self.settings.get('platforms') ep.locales = ["es", "en"] - request = ep.build_request(msg_str, "hiro(a)torproject.org", platforms) + request = ep.build_request(msg_str, "hiro(a)torproject.org") self.assertEqual(request["command"], "links") self.assertEqual(request["platform"], "osx") self.assertEqual(request["language"], "es")

1 0

[snowflake/master] Remove unused maxMessageSize constant.
by dcf＠torproject.org 31 Jan '20

31 Jan '20

commit 564d1c83634f26341c423815387e728f14c0e61d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jan 31 00:15:11 2020 -0700 Remove unused maxMessageSize constant. --- server/server.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/server.go b/server/server.go index 5d3bfc6..85bf4f5 100644 --- a/server/server.go +++ b/server/server.go @@ -30,8 +30,6 @@ import ( const ptMethodName = "snowflake" const requestTimeout = 10 * time.Second -const maxMessageSize = 64 * 1024 - // How long to wait for ListenAndServe or ListenAndServeTLS to return an error // before deciding that it's not going to return. const listenAndServeErrorTimeout = 100 * time.Millisecond

1 0