rectify tex commands in NetzBon merchant intro template

1 files changed, 27 insertions, 15 deletions

diff --git a/netzbon/template.tex.j2 b/netzbon/template.tex.j2
index 067722e..60546cd 100644
--- a/netzbon/template.tex.j2
+++ b/netzbon/template.tex.j2
@@ -1,24 +1,33 @@
 \documentclass[12pt,a4paper]{letter}
 \usepackage[utf8]{inputenc}
-\usepackage{ngerman}
+\usepackage[english]{babel}
 \usepackage[nolinks,final,forget]{qrcode}
+\usepackage[top=2cm,
+bottom=2cm,
+includefoot,
+left=2.5cm,
+right=2cm,
+footskip=1cm]{geometry}
+\usepackage{url}
+\usepackage[colorlinks=true, allcolors=black]{hyperref}
+\IfFileExists{lmodern.sty}{\usepackage{lmodern}}{}
 \date{\today}
 %
-\selectlanguage{german}
+\selectlanguage{english}
 
 \signature{Isidor}
 \begin{document}
 %
 \begin{letter}{To \\ {{data.name}}}
 
-\opening{Dear  {{data.name}},}
+\opening{Dear {{data.name}},}
 
-We are excited to introduce you to the new digital Netzbon using GNU Taler.
+We are excited to introduce you to the new digital Netzbon {\bf eNetzBon} using GNU Taler.
 In the enclosed brochure, you will find some introduction on how you can
 set up your business to accept payments in eNetzBon.
 
 This letter provides you with your personalized credentials to access your
-eNetzBon bank account and merchant backend. Please keep the password
+{\bf eNetzBon bank account} and {\bf merchant backend}. Please keep the password
 confidential as otherwise others might gain control over your eNetzBon! You
 are encouraged to set up second-factor authentication (via SMS or email)
 before using the system.
@@ -26,32 +35,35 @@ before using the system.
 Your initial password is {\bf {{data.pass}}}.
 
 Using this password and the username {\tt {{data.id}}} you can log into
-your eNetzBon bank account at {\tt https://bank.{{data.domain}}/}.
+your eNetzBon bank account at {\url{https://bank.{{data.domain}}/}}.
 
 Furthermore, we are happy to provide you with a GNU Taler merchant
-backend at {\tt https://backend.{{data.domain}}/instances/{{data.id}}/}.
+backend at {\url{https://backend.{{data.domain}}/instances/{{data.id}}/}}.
 The backend is already configured to use your eNetzBon bank account
 and uses the same password.
 
 You are encouraged to change the password (separately) in both systems.
 
-If you want to use a GNU Taler wallet (from {\tt https://wallet.taler.net/})
+If you want to use a GNU Taler wallet (from {\url{https://wallet.taler.net/}})
 you need to add eNetzBon as a payment service provider before you can use it to
 invoice your customers. To do so, please scan the following QR code with your Taler wallet:
 \begin{center}
-\qrcode[hyperlink,level=M,height=3cm]{taler://exchange/exchange.{{data.domain}}/}
-
-{\tt taler://exchange/exchange.{{data.domain}}/}
+{\qrcode[hyperlink,level=M,height=3cm]\\
+\\
+{\tt taler://exchange/exchange.{{data.domain}}/}}
+% Deprecated output because of redundancy:
+%{\tt taler://exchange/exchange.{{data.domain}}/}
 \end{center}
 
 This welcome package includes five identical stickers with a QR code which is 
 pre-configured to link all your customers' payments into your eNetzBon bank account. Your 
 specific QR code looks like this:
 \begin{center}
-\qrcode[hyperlink,level=M,height=3cm]{taler://pay-template/backend.{{data.domain}}/instances
-/{{data.id}}/default}
-
-{\tt taler://pay-template/backend.{{data.domain}}/instances/{{data.id}}/default}
+{\qrcode[hyperlink,level=M,height=3cm]\\
+\\
+{\tt taler://pay-template/backend.{{data.domain}}/instances/{{data.id}}/default}}
+% Deprecated output because of redundancy:
+%{\tt taler://pay-template/backend.{{data.domain}}/instances/{{data.id}}/default}
 \end{center}
 You are free to create additional QR codes or change the contents for this QR code
 in the merchant backend.