added initial :es translations to demonstrate how it can be done.

13 files changed, 123 insertions, 53 deletions

diff --git a/amber/config.rb b/amber/config.rb
index 8201bf7..c25ea15 100644
--- a/amber/config.rb
+++ b/amber/config.rb
@@ -1 +1,5 @@
 @title = 'Bitmask Help'
+
+# uncomment these lines once :es pages have been added
+# @default_locale = :en
+# @locales = [:en, :es]
diff --git a/amber/layouts/home.html.haml b/amber/layouts/home.html.haml
index 4517821..4a35f89 100644
--- a/amber/layouts/home.html.haml
+++ b/amber/layouts/home.html.haml
@@ -15,6 +15,21 @@
       #masthead
         = render 'layouts/masthead'
       #main
-        = yield :content
+        .darker
+          .container
+            .row
+              .col-sm-9
+                .introtext
+                  = render 'home/intro'
+              .col-sm-3
+                .download.text-left
+                  %a.btn.btn-large.btn-primary{:href => 'install'}
+                    %i.fa.fa-download.fa-2x
+                    %span
+                      = t :download_bitmask
+        .container
+          .shadow-box
+            .content-box
+              = yield :content
     #footer
       = render 'layouts/footer'
diff --git a/amber/locales/en.yml b/amber/locales/en.yml
index 74c0a7e..763a3d1 100644
--- a/amber/locales/en.yml
+++ b/amber/locales/en.yml
@@ -1,7 +1,6 @@
 en:
-  site_title: "Bitmask Help"
+  site_title: "Bitmask"
   banner_top: "Bitmask"
-  banner_bottom: "Help"
   banner_motto: "Encrypted communication for mere mortals<br>(superheroes welcome, too)"
   contribute_to_help: 'Contribute to these help pages'
   download_bitmask: 'Download Bitmask'
@@ -9,5 +8,30 @@ en:
   download: Download
   leap: 'LEAP Encryption Access Project'
   footer_text:
-  warning: <b>WARNING:</b> Bitmask is still experimental. Please do not use these beta releases of Bitmask for situations where a compromise of your data could put you in danger.
-  warning_disabled: Also, although Bitmask is improving rapidly, it is possible that you could lose your email when using an early beta release.
\ No newline at end of file
+  warning: >
+    <b>WARNING:</b> Bitmask is still experimental. Please do not use these beta
+    releases of Bitmask for situations where a compromise of your data could
+    put you in danger.
+  warning_disabled: >
+    Also, although Bitmask is improving rapidly, it is possible that you could
+    lose your email when using an early beta release.
+
+  #
+  # front page text
+  #
+  fork_our_code: Fork our code
+  about_us: About us
+  supported_providers: Supported providers
+  supported_providers_text: "The following service providers are compatible with the Bitmask application:"
+  bitmask_app_blurb: >
+    The <b>Bitmask</b> application is designed to have a <b>friendly</b> interface
+    with <b>automatic</b> configuration. You simply start the application, register
+    with the compatible service provider of your choice, and away you go.
+  bitmask_vpn: Bitmask VPN
+  bitmask_vpn_blurb: >
+    With [[Bitmask VPN => features#vpn]], all your traffic is securely routed through
+    your provider before it is decrypted and sent on to the open internet.
+  encrypted_email: Encrypted Email
+  encrypted_email_blurb: >
+    [[Bitmask Encrypted Email => features#email]] is easy to use while still being
+    backward compatible with the existing OpenPGP protocol for secure email.
\ No newline at end of file
diff --git a/amber/locales/es.yml b/amber/locales/es.yml
new file mode 100644
index 0000000..270384c
--- /dev/null
+++ b/amber/locales/es.yml
@@ -0,0 +1,31 @@
+es:
+  missing_translation: "Esta página aún no ha sido traducida del Inglés."
+  banner_bottom: "Ayuda"
+  banner_motto: "La comunicación cifrada para los simples mortales<br>(superhéroes dan la bienvenida, también)"
+  contribute_to_help: Contribuir a estas páginas de ayuda
+  download_bitmask: Descarga Bitmask
+  downloads: Descargas
+  download: Descargar
+  warning: >
+    <b>ADVERTENCIA:</b> Máscara de bits es todavía experimental. Por favor, no use estos beta
+    comunicados de Máscara de bits para las situaciones en que un compromiso de sus datos podría
+    ponerte en peligro.
+
+  #
+  # front page text
+  #
+  fork_our_code: Fork nuestro código
+  about_us: Quiénes somos
+  supported_providers: Proveedores soportados
+  supported_providers_text: "Los siguientes proveedores de servicios son compatibles con la aplicación de Bitmask:"
+  bitmask_app_blurb: >
+    El aplicación de <b>Bitmask</b> está diseñada para tener una <b>amigable</b> interfaz
+    con <b>automático</b> de configuración. Simplemente inicie la aplicación, se registra
+    con el proveedor de servicios compatibles de su elección, y ya está.
+  bitmask_vpn_blurb: >
+    Con [[Bitmask VPN => features#vpn]], todo el tráfico se enruta de forma segura a través de
+    su proveedor antes de que se descifra y se envía a la Internet abierta.
+  encrypted_email: Correo electrónico cifrado
+  encrypted_email_blurb: >
+    [[Bitmask cifrado Email => features#email]] es fácil de usar sin dejar de ser
+    compatible con el protocolo OpenPGP existente para correo electrónico seguro.
\ No newline at end of file
diff --git a/pages/en.haml b/pages/en.haml
index 08697f3..f59dc04 100644
--- a/pages/en.haml
+++ b/pages/en.haml
@@ -2,20 +2,4 @@
 - @title = 'Home'
 - @this.layout = 'home'
 
-.darker
-  .container
-    .row
-      .col-sm-9
-        .introtext
-          = render 'home/intro'
-      .col-sm-3
-        .download.text-left
-          %a.btn.btn-large.btn-primary{:href => 'install'}
-            %i.fa.fa-download.fa-2x
-            %span
-              = t :download_bitmask
-
-.container
-  .shadow-box
-    .content-box
-      = render 'home/text'
+= render 'home/text'
diff --git a/pages/es.haml b/pages/es.haml
new file mode 100644
index 0000000..d96f7d4
--- /dev/null
+++ b/pages/es.haml
@@ -0,0 +1,3 @@
+- @title = 'Casa'
+
+= render 'home/text'
diff --git a/pages/home/_about.en.text b/pages/home/_about.en.text
new file mode 100644
index 0000000..753dab1
--- /dev/null
+++ b/pages/home/_about.en.text
@@ -0,0 +1,5 @@
+!>/assets/images/leap-small.png!
+
+The *Bitmask* application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the [[LEAP Encryption Access Project => https://leap.se]], an non-profit organization dedicated to defending democracy by *protecting the right to whisper*.
+
+The service provider https://demo.bitmask.net is operated by LEAP in order to demonstrate usage of the *Bitmask* application. However, we actively encourage other organizations to start their own compatible service providers by using our free software [[platform for server automation => https://leap.se/en/platform]].
\ No newline at end of file
diff --git a/pages/home/_about.es.text b/pages/home/_about.es.text
new file mode 100644
index 0000000..885d66d
--- /dev/null
+++ b/pages/home/_about.es.text
@@ -0,0 +1,5 @@
+!>/assets/images/leap-small.png!
+
+El *Bitmask* aplicación está amorosamente a mano por un equipo de programadores pagados y voluntarios de siete países diferentes. Desarrollo es patrocinado principalmente por el [[Proyecto de Acceso LEAP Encryption => https://leap.se]], una organización sin fines de lucro dedicada a la defensa de la democracia por *la protección del derecho a susurrar*.
+
+El proveedor de servicios https://demo.bitmask.net es operado por LEAP para demostrar el uso del *Bitmask* aplicación. Sin embargo, alentamos activamente a otras organizaciones a iniciar sus propios proveedores de servicios compatibles con nuestro software libre [[plataforma para la automatización de servidores => https://leap.se/en/platform]].
\ No newline at end of file
diff --git a/pages/home/_code.en.text b/pages/home/_code.en.text
new file mode 100644
index 0000000..fca71ec
--- /dev/null
+++ b/pages/home/_code.en.text
@@ -0,0 +1,12 @@
+*Hey, you! We could use a hand here*. You want communication free of surveillance, based on open protocols, and that gives users control over their own data? Well, grab a keyboard and [[pitch in => https://leap.se/en/get-involved]]--the code is not going to write itself.
+
+In particular, if you have finely honed skill in Python, Android Java, Ruby, C, CouchDB, Windows, Mac, Puppet, Qt, or you really love crypto, we could sure use your help.
+
+* [[Fork our code => https://leap.se/en/source]]
+* Create a new branch from develop called feature/x or bugfix/x.
+* Hack away.
+* Issue a pull request on github from your feature or bugfix branch to the upstream develop branch.
+* Discuss and wait for request to be merged.
+* Repeat.
+
+Currently, we release a new version of the Bitmask application every two weeks, and other components as necessary.
diff --git a/pages/home/_intro.en.text b/pages/home/_intro.en.text
new file mode 100644
index 0000000..3a1ada5
--- /dev/null
+++ b/pages/home/_intro.en.text
@@ -0,0 +1 @@
+*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among [[several different service providers => #providers]] or [[start your own => https://leap.se/en/doc/platform]]. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works).
\ No newline at end of file
diff --git a/pages/home/_intro.es.text b/pages/home/_intro.es.text
new file mode 100644
index 0000000..b99c980
--- /dev/null
+++ b/pages/home/_intro.es.text
@@ -0,0 +1 @@
+*Bitmask* es una aplicación de código abierto para facilitar y asegurar la comunicación cifrada. Usted puede elegir entre [[varios proveedores de diferentes servicios => #providers]] o [[comenzar su propio => https: //leap.se/en/doc/platform]]. Actualmente, Bitmask que soporta cifrado en internet y correo electrónico cifrado (con más servicios en las obras).
\ No newline at end of file
diff --git a/pages/home/_intro.text b/pages/home/_intro.text
deleted file mode 100644
index b1f6379..0000000
--- a/pages/home/_intro.text
+++ /dev/null
@@ -1 +0,0 @@
-*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among "several different service providers":#providers or "start your own":https://leap.se/en/doc/platform. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works).
\ No newline at end of file
diff --git a/pages/home/_text.haml b/pages/home/_text.haml
index b14fda6..6f59d01 100644
--- a/pages/home/_text.haml
+++ b/pages/home/_text.haml
@@ -1,29 +1,33 @@
 .row
   .col-sm-12
-    %p.big The <b>Bitmask</b> application is designed to have a <b>friendly</b> interface with <b>automatic</b> configuration. You simply start the application, register with the compatible service provider of your choice, and away you go.
+    %p.big
+      = t :bitmask_app_blurb
 
 .row
   .col-sm-6
     .heading
       %span
         %i.fa.fa-shield
-        Bitmask VPN
-    %p.big With [[Bitmask VPN => features#vpn]], all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet.
+        = t :bitmask_vpn
+    %p.big
+      = t :bitmask_vpn_blurb
   .col-sm-6
     .heading
       %span
         %i.fa.fa-envelope
-        Encrypted Email
-    %p.big [[Bitmask Encrypted Email => features#email]] is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email.
+        = t :encrypted_email
+    %p.big
+      = t :encrypted_email_blurb
 
 .row
   .col-sm-12
-    .heading
+    .heading#providers
       %span
         %i.fa.fa-institution
-        Supported providers
+        = t :supported_providers
 
-    %p.big The following service providers are compatible with the Bitmask application:
+    %p.big
+      = t :supported_providers_text
 
     .row
       .col-lg-2.col-md-3.col-sm-3.col-xs-4
@@ -52,30 +56,12 @@
     .heading
       %span
         %i.fa.fa-code-fork
-        Fork our code
-
-    %p <b>Hey, you! We could use a hand here</b>. You want communication free of surveillance, based on open protocols, and that gives users control over their own data? Well, grab a keyboard and #{link 'pitch in' => 'https://leap.se/en/get-involved'}&mdash;the code is not going to write itself.
-
-    %p In particular, if you have finely honed skill in Python, Android Java, Ruby, C, CouchDB, Windows, Mac, Puppet, Qt, or you really love crypto, we could sure use your help.
-
-    %ol
-      %li #{link 'Fork our code' => 'https://leap.se/en/source'}.
-      %li Create a new branch from develop called feature/x or bugfix/x.
-      %li Hack away.
-      %li Issue a pull request on github from your feature or bugfix branch to the upstream develop branch.
-      %li Discuss and wait for request to be merged.
-      %li Repeat.
-
-    %p Currently, we release a new version of the Bitmask application every two weeks, and other components as necessary.
+        = t :fork_our_code
+    = render 'home/code'
 
   .col-sm-6
     .heading
       %span
         %i.fa.fa-group
-        About us
-
-    %img{src:'/assets/images/leap-small.png', align:'right'}
-
-    %p The <b>Bitmask</b> application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the #{link 'LEAP Encryption Access Project' => 'https://leap.se'}, an non-profit organization dedicated to defending democracy by <b>protecting the right to whisper</b>.
-
-    %p The service provider <b>demo.bitmask.net</b> is operated by LEAP in order to demonstrate usage of the <b>Bitmask</b> application. However, we actively encourage other organizations to start their own compatible service providers by using our free software #{link 'platform for server automation' => 'https://leap.se/en/platform'}.
+        = t :about_us
+    = render 'home/about'