[tor-commits] [community/master] Finish templating

hiro at torproject.org hiro at torproject.org
Wed Apr 10 14:24:54 UTC 2019


commit 12735c762a90c68370c6b8a872bd9bf59f881ba7
Author: hiro <hiro at torproject.org>
Date:   Wed Apr 10 16:24:46 2019 +0200

    Finish templating
---
 .../becoming-tor-translator/contents.lr            |  4 +-
 content/localization/contents+en.lr                |  4 +-
 content/localization/contents+es.lr                |  4 +-
 content/localization/contents+fr.lr                |  4 +-
 content/localization/contents.lr                   |  4 +-
 content/localization/pick-a-project/contents.lr    | 17 +++++
 content/localization/translate-strings/contents.lr | 17 +++++
 content/onion-services/contents+en.lr              |  2 +
 content/onion-services/contents+es.lr              |  2 +
 content/onion-services/contents+fr.lr              |  2 +
 content/onion-services/contents.lr                 |  2 +
 content/onion-services/setup/contents.lr           | 19 ++++++
 content/onion-services/ssl-tls/contents.lr         | 19 ++++++
 content/user-testing/current/contents.lr           |  2 +-
 content/user-testing/signup/contents.lr            |  2 +-
 databags/pagenav+en.ini                            |  6 +-
 databags/pagenav+es.ini                            | 34 +++++-----
 databags/pagenav+fr.ini                            | 34 +++++-----
 templates/localization.html                        | 78 ++++++++++++++++++++++
 templates/onion-services.html                      | 46 +++++++++++++
 templates/outreach.html                            |  3 +-
 21 files changed, 263 insertions(+), 42 deletions(-)

diff --git a/content/localization/becoming-tor-translator/contents.lr b/content/localization/becoming-tor-translator/contents.lr
index fe556fd..3724fbc 100644
--- a/content/localization/becoming-tor-translator/contents.lr
+++ b/content/localization/becoming-tor-translator/contents.lr
@@ -8,9 +8,9 @@ _template: layout.html
 ---
 title: Becoming Tor translator
 ---
-subtitle: 
+subtitle: Pictures and instructions ... 
 ---
-key: 5
+key: 1
 ---
 html: localization.html
 ---
diff --git a/content/localization/contents+en.lr b/content/localization/contents+en.lr
index b483d03..6c9d732 100644
--- a/content/localization/contents+en.lr
+++ b/content/localization/contents+en.lr
@@ -6,7 +6,7 @@ color: primary
 ---
 _template: layout.html
 ---
-title: Join the Tor Community
+title: Localization
 ---
 subtitle: We want Tor to work for everyone in the world, which means a lot of languages. Will you help us to translate?
 ---
@@ -15,3 +15,5 @@ key: 5
 html: localization.html
 ---
 body:
+
+In order for Tor to work for everyone, it needs to speak everyone's languages. Our translation team works hard to make this a reality, and we can always use more volunteers to help translate. Our current translation priorities are translating Tor Browser and the Tor website into our tier 1 and tier 2 languages (listed below), but we welcome translations for other materials and languages, too.
diff --git a/content/localization/contents+es.lr b/content/localization/contents+es.lr
index b483d03..6c9d732 100644
--- a/content/localization/contents+es.lr
+++ b/content/localization/contents+es.lr
@@ -6,7 +6,7 @@ color: primary
 ---
 _template: layout.html
 ---
-title: Join the Tor Community
+title: Localization
 ---
 subtitle: We want Tor to work for everyone in the world, which means a lot of languages. Will you help us to translate?
 ---
@@ -15,3 +15,5 @@ key: 5
 html: localization.html
 ---
 body:
+
+In order for Tor to work for everyone, it needs to speak everyone's languages. Our translation team works hard to make this a reality, and we can always use more volunteers to help translate. Our current translation priorities are translating Tor Browser and the Tor website into our tier 1 and tier 2 languages (listed below), but we welcome translations for other materials and languages, too.
diff --git a/content/localization/contents+fr.lr b/content/localization/contents+fr.lr
index b483d03..6c9d732 100644
--- a/content/localization/contents+fr.lr
+++ b/content/localization/contents+fr.lr
@@ -6,7 +6,7 @@ color: primary
 ---
 _template: layout.html
 ---
-title: Join the Tor Community
+title: Localization
 ---
 subtitle: We want Tor to work for everyone in the world, which means a lot of languages. Will you help us to translate?
 ---
@@ -15,3 +15,5 @@ key: 5
 html: localization.html
 ---
 body:
+
+In order for Tor to work for everyone, it needs to speak everyone's languages. Our translation team works hard to make this a reality, and we can always use more volunteers to help translate. Our current translation priorities are translating Tor Browser and the Tor website into our tier 1 and tier 2 languages (listed below), but we welcome translations for other materials and languages, too.
diff --git a/content/localization/contents.lr b/content/localization/contents.lr
index b483d03..6c9d732 100644
--- a/content/localization/contents.lr
+++ b/content/localization/contents.lr
@@ -6,7 +6,7 @@ color: primary
 ---
 _template: layout.html
 ---
-title: Join the Tor Community
+title: Localization
 ---
 subtitle: We want Tor to work for everyone in the world, which means a lot of languages. Will you help us to translate?
 ---
@@ -15,3 +15,5 @@ key: 5
 html: localization.html
 ---
 body:
+
+In order for Tor to work for everyone, it needs to speak everyone's languages. Our translation team works hard to make this a reality, and we can always use more volunteers to help translate. Our current translation priorities are translating Tor Browser and the Tor website into our tier 1 and tier 2 languages (listed below), but we welcome translations for other materials and languages, too.
diff --git a/content/localization/pick-a-project/contents.lr b/content/localization/pick-a-project/contents.lr
new file mode 100644
index 0000000..323ce32
--- /dev/null
+++ b/content/localization/pick-a-project/contents.lr
@@ -0,0 +1,17 @@
+section: localization
+---
+section_id: localization
+---
+color: primary
+---
+_template: layout.html
+---
+title: Pick a project
+---
+subtitle: How to find things ... 
+---
+key: 2
+---
+html: localization.html
+---
+body:
diff --git a/content/localization/translate-strings/contents.lr b/content/localization/translate-strings/contents.lr
new file mode 100644
index 0000000..803e52e
--- /dev/null
+++ b/content/localization/translate-strings/contents.lr
@@ -0,0 +1,17 @@
+section: localization
+---
+section_id: localization
+---
+color: primary
+---
+_template: layout.html
+---
+title: Translate strings
+---
+subtitle: How to do this ...
+---
+key: 3
+---
+html: localization.html
+---
+body:
diff --git a/content/onion-services/contents+en.lr b/content/onion-services/contents+en.lr
index b862a5d..2c93936 100644
--- a/content/onion-services/contents+en.lr
+++ b/content/onion-services/contents+en.lr
@@ -15,3 +15,5 @@ key: 6
 html: onion-services.html
 ---
 body:
+
+Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/contents+es.lr b/content/onion-services/contents+es.lr
index b862a5d..2c93936 100644
--- a/content/onion-services/contents+es.lr
+++ b/content/onion-services/contents+es.lr
@@ -15,3 +15,5 @@ key: 6
 html: onion-services.html
 ---
 body:
+
+Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/contents+fr.lr b/content/onion-services/contents+fr.lr
index b862a5d..2c93936 100644
--- a/content/onion-services/contents+fr.lr
+++ b/content/onion-services/contents+fr.lr
@@ -15,3 +15,5 @@ key: 6
 html: onion-services.html
 ---
 body:
+
+Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr
index b862a5d..2c93936 100644
--- a/content/onion-services/contents.lr
+++ b/content/onion-services/contents.lr
@@ -15,3 +15,5 @@ key: 6
 html: onion-services.html
 ---
 body:
+
+Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr
new file mode 100644
index 0000000..571feca
--- /dev/null
+++ b/content/onion-services/setup/contents.lr
@@ -0,0 +1,19 @@
+section: onion services
+---
+section_id: onion-services
+---
+color: primary
+---
+image: cloud-upload-alt
+---
+_template: layout.html
+---
+title: Set up your .onion Service
+---
+subtitle: Learn how to set up a .onion of your very own.
+---
+key: 1
+---
+html: onion-services.html
+---
+body:
diff --git a/content/onion-services/ssl-tls/contents.lr b/content/onion-services/ssl-tls/contents.lr
new file mode 100644
index 0000000..5d9233e
--- /dev/null
+++ b/content/onion-services/ssl-tls/contents.lr
@@ -0,0 +1,19 @@
+section: onion services
+---
+section_id: onion-services
+---
+color: primary
+---
+image: lock
+---
+_template: layout.html
+---
+title: Adding SSL/TLS to a .onion site
+---
+subtitle: Add more security and authenticity for your .onion.
+---
+key: 2
+---
+html: onion-services.html
+---
+body:
diff --git a/content/user-testing/current/contents.lr b/content/user-testing/current/contents.lr
index 5192ba2..1d10937 100644
--- a/content/user-testing/current/contents.lr
+++ b/content/user-testing/current/contents.lr
@@ -1,6 +1,6 @@
 section: user testing
 ---
-section_id: user testing
+section_id: user-testing
 ---
 color: primary
 ---
diff --git a/content/user-testing/signup/contents.lr b/content/user-testing/signup/contents.lr
index f6ed4bf..e238096 100644
--- a/content/user-testing/signup/contents.lr
+++ b/content/user-testing/signup/contents.lr
@@ -1,6 +1,6 @@
 section: user testing
 ---
-section_id: user testing
+section_id: user-testing
 ---
 color: primary
 ---
diff --git a/databags/pagenav+en.ini b/databags/pagenav+en.ini
index 1ad40f2..1f4097c 100644
--- a/databags/pagenav+en.ini
+++ b/databags/pagenav+en.ini
@@ -14,9 +14,9 @@ label = Training
 path = outreach
 label = Outreach
 
-[translations]
-path = translations
-label = Translations
+[localization]
+path = localization
+label = Localization
 
 [onion-services]
 path = onion-services
diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini
index 43f44fd..1f4097c 100644
--- a/databags/pagenav+es.ini
+++ b/databags/pagenav+es.ini
@@ -1,19 +1,23 @@
-[history]
-path = about/history
-label = History
+[relay-operations]
+path = relay-operations
+label = Relay Operations
 
-[people]
-path = about/people
-label = People
+[user-testing]
+path = user-testing
+label = User Testing
 
-[sponsors]
-path = about/sponsors
-label = Sponsors
+[training]
+path = training
+label = Training
 
-[reports]
-path = about/reports
-label = Reports
+[outreach]
+path = outreach
+label = Outreach
 
-[jobs]
-path = about/jobs
-label = Jobs
+[localization]
+path = localization
+label = Localization
+
+[onion-services]
+path = onion-services
+label = .Onion Services
diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini
index 43f44fd..1f4097c 100644
--- a/databags/pagenav+fr.ini
+++ b/databags/pagenav+fr.ini
@@ -1,19 +1,23 @@
-[history]
-path = about/history
-label = History
+[relay-operations]
+path = relay-operations
+label = Relay Operations
 
-[people]
-path = about/people
-label = People
+[user-testing]
+path = user-testing
+label = User Testing
 
-[sponsors]
-path = about/sponsors
-label = Sponsors
+[training]
+path = training
+label = Training
 
-[reports]
-path = about/reports
-label = Reports
+[outreach]
+path = outreach
+label = Outreach
 
-[jobs]
-path = about/jobs
-label = Jobs
+[localization]
+path = localization
+label = Localization
+
+[onion-services]
+path = onion-services
+label = .Onion Services
diff --git a/templates/localization.html b/templates/localization.html
index e69de29..fb18348 100644
--- a/templates/localization.html
+++ b/templates/localization.html
@@ -0,0 +1,78 @@
+<div class="container py-5">
+  <h2 class="text-primary">{{ _('Localization is how we reach a global community.') }}</h2>
+  <div class="row py-5">
+    <div class="col-8">
+      {{ this.body }}
+    </div>
+    <div class="col-4 bg-light">
+      <p>Illustration area</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4">
+      <h4 class="text-primary text-uppercase">Tier 1</h4>
+      <table class="table table-hover">
+        <thead>
+          <tr>
+            <th scope="col">{{ _('Language') }}</th>
+            <th scope="col">{{ _('Projects supported') }}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>{{ _('English') }}</td>
+            <td>{{ _('Tor Browser, Website') }}</td>
+          </tr>
+          <tr>
+            <td>{{ _('German') }}</td>
+            <td>{{ _('Tor Browser, Website') }}</td>
+          </tr>
+          <tr>
+            <td>{{ _('French') }}</td>
+            <td>{{ _('Tor Browser, Website') }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4">
+      <h4 class="text-primary text-uppercase">Tier 2</h4>
+      <table class="table table-hover">
+        <thead>
+          <tr>
+            <th scope="col">{{ _('Language') }}</th>
+            <th scope="col">{{ _('Projects supported') }}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>{{ _('Portuguese') }}</td>
+            <td>{{ _('Tor Browser, Website') }}</td>
+          </tr>
+          <tr>
+            <td>{{ _('Arabic') }}</td>
+            <td>{{ _('Tor Browser, Website') }}</td>
+          </tr>
+          <tr>
+            <td>{{ _('Greek') }}</td>
+            <td>{{ _('Tor Browser, Website') }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="row">
+    {% for child in this.children|sort(attribute='key') %}
+      <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4">
+        <div class="card h-100 border-0">
+          <div class="card-body">
+            <div class="card-body">
+              <h4 class="text-primary">.{{ child.key }}</h4>
+              <h4 class="card-title text-primary">{{ child.title }}</h4>
+              <p class="card-text">{{ child.subtitle }}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+</div>
diff --git a/templates/onion-services.html b/templates/onion-services.html
index e69de29..c9bc3b5 100644
--- a/templates/onion-services.html
+++ b/templates/onion-services.html
@@ -0,0 +1,46 @@
+<div class="container py-5">
+  <h2 class="text-primary">{{ _('What are Onion Services?') }}</h2>
+  <div class="row py-5">
+    <div class="col-8">
+      {{ this.body }}
+    </div>
+    <div class="col-4 bg-light">
+      <p>Illustration area</p>
+    </div>
+  </div>
+  <h2 class="text-primary"><u>{{ _('Learn more about onion services here') }}
+    <i class="fas fa-arrow-right"></i></u>
+  </h2>
+  <div class="row py-5">
+    {% for child in this.children|sort(attribute='key') %}
+      <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4">
+        <div class="card h-100 border-0">
+          <div class="card-body">
+            <h2 class="text-primary display-2"><i class="fas fa-{{ child.image }}"></i></h2>
+            <h4 class="card-title text-primary">{{ child.title }}</h4>
+            <p class="card-text">{{ child.subtitle }}</p>
+            <a href="{{ this.path }}">Call to action <i class="fas fa-arrow-right"></i></a>
+          </div>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+  <div class="row py-5 text-center mx-auto">
+    <h2 class="display-4 text-primary text-center mx-auto">{{ _('Onionize any website') }}</h2>
+    <p class="text-center">
+      {{ _('There\'s a toolkit that lets you take any existing website and host it as a .onion site. You would wanna do this because .onion sites are more secure than just regular sites. We show you how to use this toolkit and onionize a site.') }}
+    </p>
+  </div>
+  <div class="row mx-auto">
+    <div class="col-6">
+      <h3 class="text-primary text-center mx-auto"><u>{{ _('Learn more') }}
+        <i class="fas fa-arrow-right"></i></u>
+      </h3>
+    </div>
+    <div class="col-6">
+      <h3 class="text-primary text-center mx-auto"><u>{{ _('Check out the code') }}
+        <i class="fas fa-arrow-right"></i></u>
+      </h3>
+    </div>
+  </div>
+</div>
diff --git a/templates/outreach.html b/templates/outreach.html
index c414b95..5bfb9a3 100644
--- a/templates/outreach.html
+++ b/templates/outreach.html
@@ -7,7 +7,8 @@
     <div class="col-4">
     </div>
   </div>
-  <div class="row py-5">
+  <div class="row">
+    <h2 class="text-primary">{{ _('Help us translate') }}</h2>
     {% for child in this.children|sort(attribute='key') %}
       <div class="col-sm-4 col-md-4 col-sm-12 col-xl-4 py-4">
         <div class="card h-100 border-0">



More information about the tor-commits mailing list