[torbutton/maint-1.9.6] Bug 21243: Add links to es, fr, pt Tor Browser manual

19 Jan 2017

commit c4295bf010c637f13c8766cfc203369183b5725f
Author: Arthur Edelstein <arthuredelstein@gmail.com>
Date:   Tue Jan 17 17:42:12 2017 -0800

    Bug 21243: Add links to es, fr, pt Tor Browser manual
---
 src/chrome/content/menu-overlay.xul  |  8 ++++----
 src/chrome/content/torbutton.js      | 10 +++-------
 src/chrome/locale/en/aboutTor.dtd    |  3 ++-
 src/chrome/locale/en/torbutton.dtd   |  2 --
 src/chrome/locale/es/aboutTor.dtd    |  3 ++-
 src/chrome/locale/fr/aboutTor.dtd    |  3 ++-
 src/chrome/locale/pt-BR/aboutTor.dtd |  3 ++-
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul
index 8067b5c..4970114 100644
--- a/src/chrome/content/menu-overlay.xul
+++ b/src/chrome/content/menu-overlay.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: HTML -*- -->
 
-<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/aboutTor.dtd">
 
 <overlay id="torbutton-menu-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -20,8 +20,8 @@
     <menuitem name="torBrowserUserManual"
               id="torBrowserUserManual"
               position="1"
-              label="&torbutton.torbrowser_user_manual.label;"
-              accesskey="&torbutton.torbrowser_user_manual.accesskey;"
-              oncommand="torbutton_open_torbrowser_user_manual()" />
+              label="&aboutTor.torbrowser_user_manual.label;"
+              accesskey="&aboutTor.torbrowser_user_manual.accesskey;"
+              oncommand="gBrowser.selectedTab = gBrowser.addTab('&aboutTor.torbrowser_user_manual.link;')" />
   </menupopup>
 </overlay>
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index e103e55..0023390 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -2409,15 +2409,11 @@ function torbutton_update_noscript_button()
   }, 0);
 }
 
-// Opens the Tor Browser User Manual in a new tab
-function torbutton_open_torbrowser_user_manual() {
-  gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org");
-}
-
 // Returns true if we should show the tor browser manual.
 function torbutton_show_torbrowser_manual() {
-  let locale = torbutton_get_general_useragent_locale();
-  return locale.startsWith("en");
+  let availableLocales = ["en", "es", "fr", "pt"];
+  let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2);
+  return availableLocales.indexOf(shortLocale) >= 0;
 }
 
 // Makes sure the item in the Help Menu and the link in about:tor
diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd
index 4385ca8..3950ff9 100644
--- a/src/chrome/locale/en/aboutTor.dtd
+++ b/src/chrome/locale/en/aboutTor.dtd
@@ -29,8 +29,9 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
 <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
 <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
-<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/en-US">
 <!ENTITY aboutTor.helpInfo1.label "You Can Help!">
 <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
 <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index c67ec6e..97a994f 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -59,5 +59,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
-<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 6983c83..0fddda4 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -29,8 +29,9 @@
 <!ENTITY aboutTor.whatnextAnswer.label "¡Tor NO es todo lo que necesita para navegar anónimamente! Puede necesitar cambiar alguno de sus hábitos de navegación para asegurar que su identidad permanezca segura.">
 <!ENTITY aboutTor.whatnext.label "Consejos para permenecer anónimo »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
 <!ENTITY aboutTor.torbrowser_user_manual.label "Manual de usuario del Navegador Tor »">
-<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/es-ES">
 <!ENTITY aboutTor.helpInfo1.label "¡Usted puede ayudar!">
 <!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte.">
 <!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »">
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index ad72a27..c2e990b 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -29,8 +29,9 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité.">
 <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning">
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "G">
 <!ENTITY aboutTor.torbrowser_user_manual.label "Le guide d'utilisation du navigateur Tor »">
-<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/fr">
 <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !">
 <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :">
 <!ENTITY aboutTor.helpInfo3.label "Faire tourner un nœud relais Tor »">
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 04548e0..7991929 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -29,8 +29,9 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor NÃO é tudo o que você precisa para navegar anonimamente! Para isso, você precisará mudar alguns hábitos de utilização da Internet, que garantirão a proteção da sua identidade. ">
 <!ENTITY aboutTor.whatnext.label "Dicas para garantir seu anonimato"">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
 <!ENTITY aboutTor.torbrowser_user_manual.label "Manual de Uso do Navegador Tor » ">
-<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/pt-BR">
 <!ENTITY aboutTor.helpInfo1.label "Você pode ajudar!">
 <!ENTITY aboutTor.helpInfo2.label "Existem várias maneiras de ajudar a rede Tor a tornar-se mais rápida e eficaz:">
 <!ENTITY aboutTor.helpInfo3.label "Rodar um Nó de Retransmissor Tor »">

    

gk＠torproject.org

tags

participants (1)