[git] gnupg-doc - branch, preview, updated. 0d162723e855bfb37e271df15d010c748395c82a

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, preview has been updated
       via  0d162723e855bfb37e271df15d010c748395c82a (commit)
      from  89e581ac8966226833b0631bf4fade7d5a3a6558 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d162723e855bfb37e271df15d010c748395c82a
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 16 11:57:06 2017 +0200

    campaign: Add German Thank You page
    
    Also fix handling of the lang parameter in procdonate.cgi

diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index cd17997..eeff19b 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -594,6 +594,7 @@ sub check_donation ()
     }
 
     # Now create a session.
+    $data{"lang"} = $lang;
     $data{"Stripeamount"} = $stripeamount;
     $data{"Euroamount"} = $euroamount;
     $data{"Recur"} = $recur;
@@ -622,6 +623,10 @@ sub resend_main_page ()
     my %data;
 
     payproc ('SESSION get ' . $sessid, \%data) or fail $data{"ERR_Description"};
+    # If the session has a lang value use that.
+    if ($data{"lang"} ne '') {
+        $lang = $data{"lang"};
+    }
     $amount = $data{"Amount"};
     $currency = $data{"Currency"};
     $recur = $data{"Recur"};
@@ -648,6 +653,11 @@ sub complete_stripe_checkout ()
     # been charged.  Somehow delete the token
     payproc ('SESSION get ' . $sessid, \%data) or fail $data{"ERR_Description"};
 
+    # If the session has a lang value use that.
+    if ($data{"lang"} ne '') {
+        $lang = $data{"lang"};
+    }
+
     # Do the checkout.
     $stripe{"Card-Token"} = $q->param("stripeToken");
     $stripe{"Currency"} = $data{"Currency"};
@@ -756,6 +766,11 @@ sub get_paypal_approval ()
     payproc ('SESSION get ' . $sessid, \%data)
         or fail $data{"ERR_Description"};
 
+    # If the session has a lang value use that.
+    if ($data{"lang"} ne '') {
+        $lang = $data{"lang"};
+    }
+
     $request{"Currency"} = $data{"Currency"};
     $request{"Amount"} = $data{"Amount"};
     $request{"Desc"} =
@@ -813,6 +828,11 @@ sub confirm_paypal_checkout ()
     payproc ('SESSION get ' . $sessid, \%data)
         or fail $data{"ERR_Description"};
 
+    # If the session has a lang value use that.
+    if ($data{"lang"} ne '') {
+        $lang = $data{"lang"};
+    }
+
     if ( $data{"Paytype"} ne "pp" ) {
         fail "Invalid paytype for Paypal transaction";
     }
@@ -900,6 +920,11 @@ sub complete_sepa ()
     payproc ('SESSION get ' . $sessid, \%data)
         or fail $data{"ERR_Description"};
 
+    # If the session has a lang value use that.
+    if ($data{"lang"} ne '') {
+        $lang = $data{"lang"};
+    }
+
     $request{"Currency"} = $data{"Currency"};
     $request{"Amount"} = $data{"Amount"};
     $request{"Desc"} = "GnuPG SEPA donation";
diff --git a/web/donate/donate-thanks.de.org b/web/donate/donate-thanks.de.org
new file mode 100644
index 0000000..319ff63
--- /dev/null
+++ b/web/donate/donate-thanks.de.org
@@ -0,0 +1,29 @@
+#+TITLE: GnuPG - Donate - Danke schön
+#+STARTUP: showall
+#+SETUPFILE: "../share/setup.inc"
+
+* Spende - Danke schön
+
+  *Vielen Dank für Ihre Spende zur Unterstützung userer Arbeit an GnuPG.*
+
+  Bitte beachten Sie, daß die [[https://www.gnupg.org/donate/kudos.html][Liste der Spender]] etwa alle 15 Minuten
+  aktualisiert wird.  Es kann deswegen einige Zeit dauern, bis Ihre Spende
+  und, sofern gewünscht, Iht Name dort erscheint.
+
+  Hier ist eine Zusammenfassung Ihrer Spende:
+#+BEGIN_HTML
+  <pre id="checkoutSummary">
+  <!--MESSAGE-->
+  </pre>
+#+END_HTML
+
+  Auf Ihrer Kreditkartenabrechnung wird diese Spende als /GnuPG
+  donation/ erscheinen.  Falls Sie Fragen haben, so schreiben Sie
+  bitte an /donations/ at /gnupg.org/.
+
+
+#+BEGIN_HTML
+  <ul>
+    <li><a href="/index.de.html">Weiter</a></li>
+  </ul>
+#+END_HTML

-----------------------------------------------------------------------

Summary of changes:
 cgi/procdonate.cgi              | 25 +++++++++++++++++++++++++
 web/donate/donate-thanks.de.org | 29 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 web/donate/donate-thanks.de.org


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org