[git] gnupg-doc - branch, preview, updated. 3f73cb3407b01071f11c8dfea2717eee0bf7e82d

[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  3f73cb3407b01071f11c8dfea2717eee0bf7e82d (commit)
      from  82dc5493e47742a665f276561f730364ce96d172 (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 3f73cb3407b01071f11c8dfea2717eee0bf7e82d
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 30 09:37:07 2017 +0200

    cgi: Fix getting Lang from the session data.
    
    In the session data dictionary we use "Lang" and not "lang".  Fix
    this so that the ocrrect pages are shown.
    
    Also fix a too long field laben in a German translation.

diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index 4f617a7..4667a5d 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -605,7 +605,7 @@ sub check_donation ()
     }
 
     # Now create a session.
-    $data{"lang"} = $lang;
+    $data{"Lang"} = $lang;
     $data{"Stripeamount"} = $stripeamount;
     $data{"Euroamount"} = $euroamount;
     $data{"Recur"} = $recur;
@@ -635,8 +635,8 @@ sub resend_main_page ()
 
     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{"Lang"} ne '') {
+        $lang = $data{"Lang"};
     }
     $amount = $data{"Amount"};
     $currency = $data{"Currency"};
@@ -776,8 +776,8 @@ sub complete_stripe_checkout ()
     $paytype = $data{"Paytype"};
 
     # If the session has a lang value use that.
-    if ($data{"lang"} ne '') {
-        $lang = $data{"lang"};
+    if ($data{"Lang"} ne '') {
+        $lang = $data{"Lang"};
     }
 
     # Do the checkout.
@@ -822,8 +822,8 @@ sub get_paypal_approval ()
         or fail $data{"ERR_Description"};
 
     # If the session has a lang value use that.
-    if ($data{"lang"} ne '') {
-        $lang = $data{"lang"};
+    if ($data{"Lang"} ne '') {
+        $lang = $data{"Lang"};
     }
 
     $request{"Currency"} = $data{"Currency"};
@@ -883,8 +883,8 @@ sub cancel_paypal_checkout ()
         or fail $data{"ERR_Description"};
 
     # If the session has a lang value use that.
-    if ($data{"lang"} ne '') {
-        $lang = $data{"lang"};
+    if ($data{"Lang"} ne '') {
+        $lang = $data{"Lang"};
     }
 
     if ( $data{"Paytype"} ne "pp" ) {
@@ -927,8 +927,8 @@ sub confirm_paypal_checkout ()
         or fail $data{"ERR_Description"};
 
     # If the session has a lang value use that.
-    if ($data{"lang"} ne '') {
-        $lang = $data{"lang"};
+    if ($data{"Lang"} ne '') {
+        $lang = $data{"Lang"};
     }
 
     if ( $data{"Paytype"} ne "pp" ) {
@@ -1010,8 +1010,8 @@ sub complete_sepa ()
         or fail $data{"ERR_Description"};
 
     # If the session has a lang value use that.
-    if ($data{"lang"} ne '') {
-        $lang = $data{"lang"};
+    if ($data{"Lang"} ne '') {
+        $lang = $data{"Lang"};
     }
 
     $request{"Currency"} = $data{"Currency"};
diff --git a/web/donate/checkout-se.de.org b/web/donate/checkout-se.de.org
index 2177b09..43169f3 100644
--- a/web/donate/checkout-se.de.org
+++ b/web/donate/checkout-se.de.org
@@ -105,7 +105,7 @@
               </div>
             </div>
             <div class="form-group">
-              <label class="col-sm-3 control-label">Verwendungszweck</label>
+              <label class="col-sm-3 control-label">Zweck</label>
               <div class="col-sm-9">
                 <p class="form-control-static"><!--SEPA_REF--></p>
               </div>

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

Summary of changes:
 cgi/procdonate.cgi            | 26 +++++++++++++-------------
 web/donate/checkout-se.de.org |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)


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