From 215ee869a7968721a6338c0c237e8cecaea1f528 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Fri, 11 Dec 2015 17:35:37 +0000
Subject: [PATCH] Mesh translations

---
 locale/de/freedombone-meshweb.json | 10 ++++++++++
 locale/de/freedombone.json         |  5 +++++
 locale/es/freedombone-meshweb.json | 10 ++++++++++
 locale/es/freedombone.json         |  5 +++++
 locale/fr/freedombone-meshweb.json | 10 ++++++++++
 locale/fr/freedombone.json         |  5 +++++
 src/freedombone-meshweb            | 32 ++++++++++++++++--------------
 7 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/locale/de/freedombone-meshweb.json b/locale/de/freedombone-meshweb.json
index aed0f5b8..166d9b1f 100644
--- a/locale/de/freedombone-meshweb.json
+++ b/locale/de/freedombone-meshweb.json
@@ -1,5 +1,9 @@
 {
+    "Blogging on the Mesh": "",
+    "A decentralized discussion group": "",
+    "Mail for the Mesh": "",
     "IPFS could not be initialised": "",
+    "${MY_USERNAME}'s Blog": "",
     "Address:    $ZERONET_BLOG_ADDRESS": "",
     "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS": "",
@@ -7,6 +11,12 @@
     "Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "ZeroNet Blog address: $ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "${MY_USERNAME}'s Mail": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
     "Address:    $ZERONET_FORUM_ADDRESS": "",
     "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
     "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS": "",
diff --git a/locale/de/freedombone.json b/locale/de/freedombone.json
index 8dfa00a5..9442c867 100644
--- a/locale/de/freedombone.json
+++ b/locale/de/freedombone.json
@@ -20,6 +20,11 @@
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
     "Address:    $ZERONET_FORUM_ADDRESS": "",
     "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
diff --git a/locale/es/freedombone-meshweb.json b/locale/es/freedombone-meshweb.json
index aed0f5b8..166d9b1f 100644
--- a/locale/es/freedombone-meshweb.json
+++ b/locale/es/freedombone-meshweb.json
@@ -1,5 +1,9 @@
 {
+    "Blogging on the Mesh": "",
+    "A decentralized discussion group": "",
+    "Mail for the Mesh": "",
     "IPFS could not be initialised": "",
+    "${MY_USERNAME}'s Blog": "",
     "Address:    $ZERONET_BLOG_ADDRESS": "",
     "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS": "",
@@ -7,6 +11,12 @@
     "Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "ZeroNet Blog address: $ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "${MY_USERNAME}'s Mail": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
     "Address:    $ZERONET_FORUM_ADDRESS": "",
     "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
     "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS": "",
diff --git a/locale/es/freedombone.json b/locale/es/freedombone.json
index 8dfa00a5..9442c867 100644
--- a/locale/es/freedombone.json
+++ b/locale/es/freedombone.json
@@ -20,6 +20,11 @@
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
     "Address:    $ZERONET_FORUM_ADDRESS": "",
     "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
diff --git a/locale/fr/freedombone-meshweb.json b/locale/fr/freedombone-meshweb.json
index aed0f5b8..166d9b1f 100644
--- a/locale/fr/freedombone-meshweb.json
+++ b/locale/fr/freedombone-meshweb.json
@@ -1,5 +1,9 @@
 {
+    "Blogging on the Mesh": "",
+    "A decentralized discussion group": "",
+    "Mail for the Mesh": "",
     "IPFS could not be initialised": "",
+    "${MY_USERNAME}'s Blog": "",
     "Address:    $ZERONET_BLOG_ADDRESS": "",
     "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS": "",
@@ -7,6 +11,12 @@
     "Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "ZeroNet Blog address: $ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "${MY_USERNAME}'s Mail": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
     "Address:    $ZERONET_FORUM_ADDRESS": "",
     "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
     "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS": "",
diff --git a/locale/fr/freedombone.json b/locale/fr/freedombone.json
index 8dfa00a5..9442c867 100644
--- a/locale/fr/freedombone.json
+++ b/locale/fr/freedombone.json
@@ -20,6 +20,11 @@
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
     "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
     "Address:    $ZERONET_FORUM_ADDRESS": "",
     "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
diff --git a/src/freedombone-meshweb b/src/freedombone-meshweb
index a896e9e9..b8d71e06 100755
--- a/src/freedombone-meshweb
+++ b/src/freedombone-meshweb
@@ -27,9 +27,9 @@ TRACKER_PORT=6969
 MY_USERNAME=$USER
 ZERONET_DIR=/home/$MY_USERNAME/zeronet
 UPDATED="no"
-ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh"
-ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group"
-ZERONET_DEFAULT_MAIL_TAGLINE="Mail for the Mesh"
+ZERONET_DEFAULT_BLOG_TAGLINE=$"Blogging on the Mesh"
+ZERONET_DEFAULT_FORUM_TAGLINE=$"A decentralized discussion group"
+ZERONET_DEFAULT_MAIL_TAGLINE=$"Mail for the Mesh"
 
 IPFS_PORT=4001
 
@@ -117,7 +117,7 @@ function install_zeronet_blog {
         exit 736
     fi
 
-    ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
+    ZERONET_DEFAULT_BLOG_TITLE=$"${MY_USERNAME}'s Blog"
 
     cd $ZERONET_DIR
     python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt
@@ -154,8 +154,8 @@ function install_zeronet_blog {
         echo $'ZeroBlog repo could not be cloned'
         exit 6739
     fi
-	cd /opt/zeronet/ZeroBlog
-	git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT
+    cd /opt/zeronet/ZeroBlog
+    git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT
 
     echo $"Blog address:     $ZERONET_BLOG_ADDRESS"
     echo $"Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
@@ -209,11 +209,11 @@ function install_zeronet_mail {
   fi
 
   if [ ! -d /etc/avahi ]; then
-      echo 'Avahi is not installed'
+      echo $'Avahi is not installed'
       exit 736
   fi
 
-  ZERONET_DEFAULT_MAIL_TITLE="${MY_USERNAME}'s Mail"
+  ZERONET_DEFAULT_MAIL_TITLE=$"${MY_USERNAME}'s Mail"
 
   cd /opt/zeronet
   python zeronet.py --batch siteCreate 2> /opt/zeronet/mail.txt
@@ -247,7 +247,7 @@ function install_zeronet_mail {
 
   git clone $ZERONET_MAIL_REPO ZeroMail
   if [ ! -d /opt/zeronet/ZeroMail ]; then
-      echo 'ZeroMail repo could not be cloned'
+      echo $'ZeroMail repo could not be cloned'
       exit 6739
   fi
   cd /opt/zeronet/ZeroMail
@@ -292,6 +292,8 @@ function install_zeronet_mail {
       echo "ZeroNet Mail address: $ZERONET_MAIL_ADDRESS" >> /home/$MY_USERNAME/README
       echo "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY" >> /home/$MY_USERNAME/README
   fi
+
+    echo $'Zeronet mail installed'
 }
 
 function install_zeronet_forum {
@@ -345,10 +347,10 @@ function install_zeronet_forum {
         echo $'ZeroTalk repo could not be cloned'
         exit 6739
     fi
-	cd /opt/zeronet/ZeroTalk
-	git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT
+    cd /opt/zeronet/ZeroTalk
+    git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT
 
-	echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
+    echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
     echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
     cp -r $ZERONET_DIR/ZeroTalk/* $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS
     sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS/index.html
@@ -428,8 +430,8 @@ function install_zeronet {
     if [ ! -d $ZERONET_DIR ]; then
         exit 56823
     fi
-	cd $ZERONET_DIR
-	git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT
+    cd $ZERONET_DIR
+    git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT
     #cd $ZERONET_DIR
     #git checkout bashrc/bootstrap-file
     # Hack to ensure that the file access port is opened
@@ -460,7 +462,7 @@ if [[ $SERVER_INSTALLATION == "no" ]]; then
         install_zeronet_blog
         install_zeronet_mail
         install_zeronet_forum
-        install_ipfs
+        #install_ipfs
         sudo batman start
         if [ ! "$?" = "0" ]; then
             exit 2