[git] gnupg-doc - branch, master, updated. d13f9b2416d9d17b1f59acaf79f73567cd978db0

[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, master has been updated
       via  d13f9b2416d9d17b1f59acaf79f73567cd978db0 (commit)
       via  5c1f3e66a4504a132d6db051f30a96765a010133 (commit)
      from  b3811843063e595eaa057203692b23d8dd840670 (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 d13f9b2416d9d17b1f59acaf79f73567cd978db0
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 13 13:01:05 2017 +0200

    tools: Print the payment provider in the thanks mail.
    
    This is mainly useful when reviewing the copies of the thanks mail we
    receive.

diff --git a/tools/append-to-donors.sh b/tools/append-to-donors.sh
index c189ab2..b5dc9e6 100755
--- a/tools/append-to-donors.sh
+++ b/tools/append-to-donors.sh
@@ -116,6 +116,7 @@ trap "rm -f $LOCKFILE $donors.tmp $donors.stamp" 0
 #  name     - The name or empty for an anonymous donation
 #  message  - The message to us or empty
 #  recur    - only when called with an arg > 0
+#  service  - 1 = Stripe, 2 = Paypal, 3 = SEPA
 # Used scratch variables:
 #  upcurrency
 #  ineuro
@@ -141,6 +142,16 @@ send_thanks () {
                 ;;
         esac
     fi
+    case "$service" in
+        1) service_text="Stripe"
+           ;;
+        2) service_text="PayPal"
+           ;;
+        3) service_text="SEPA"
+           ;;
+        *) service_text="$service"
+           ;;
+    esac
     upcurrency=$(echo $currency | tr [a-z] [A-Z])
     if [ "$upcurrency" = EUR ]; then
         ineuro=
@@ -174,7 +185,8 @@ X-Loop: gnupg-donations-thanks.gnupg.org
 
 Dear ${name:-Anonymous},
 
-we received $xamount $upcurrency$ineuro as a ${recur_text} donation to the GnuPG project.
+we received $xamount $upcurrency$ineuro as a ${recur_text} donation for GnuPG (via $service_text).
+
 Your donation helps us to develop and maintain GnuPG and related software.
 
 Thank you.
@@ -202,6 +214,7 @@ X-Loop: gnupg-donations-thanks.gnupg.org
 Name ..: ${name:-Anonymous}
 Amount : $amount $upcurrency $ineuro
 Recur .: $recur_text
+Account: $service_text
 Message: $message
 EOF
     ) | $SENDMAIL -oi donations at gnupg.org
@@ -235,11 +248,11 @@ find $journal_dir/ -type f -name 'journal-????????.log' -print \
         [ "$jdate" -gt "$lastdate" ] && lastline=0
         # First for charge records
         payproc-jrnl -F_lnr -Fdate -F'[name]' -F'[message]' \
-                     -Fmail -Famount -Fcurrency -Feuro\
+                     -Fmail -Famount -Fcurrency -Feuro -Fservice \
            -S "_lnr > $lastline" -Stype=C -Saccount==1 \
            --html --print "$journal_dir/journal-$jdate.log" \
          | while IFS=: read lnr datestr name message \
-                            xmail amount currency euro rest; do
+                            xmail amount currency euro service rest; do
             name=$(echo "$name" | tr \`\$: ...)
             message=$(echo "$message" | tr \`\$ ..)
             xmail=$(echo "$xmail" | tr \`\$ .. | sed 's/\.$//')
@@ -250,11 +263,11 @@ find $journal_dir/ -type f -name 'journal-????????.log' -print \
          done
         # Second for new subscriptions
         payproc-jrnl -F_lnr -Fdate -F'[name]' -F'[message]' \
-                     -Fmail -Famount -Fcurrency -Feuro -Frecur\
+                     -Fmail -Famount -Fcurrency -Feuro -F service -Frecur \
            -S "_lnr > $lastline" -Stype=S -Saccount==1 \
            --html --print "$journal_dir/journal-$jdate.log" \
          | while IFS=: read lnr datestr name message \
-                            xmail amount currency euro recur rest; do
+                            xmail amount currency euro service recur rest; do
             name=$(echo "$name" | tr \`\$: ...)
             message=$(echo "$message" | tr \`\$ ..)
             xmail=$(echo "$xmail" | tr \`\$ .. | sed 's/\.$//')

commit 5c1f3e66a4504a132d6db051f30a96765a010133
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 13 13:00:13 2017 +0200

    web: Add new page for Donors in 2017.

diff --git a/web/donate/kudos-2017.org b/web/donate/kudos-2017.org
new file mode 100644
index 0000000..fd6bce5
--- /dev/null
+++ b/web/donate/kudos-2017.org
@@ -0,0 +1,19 @@
+#+TITLE: GnuPG - List of Donors - 2017
+#+STARTUP: showall
+#+SETUPFILE: "../share/setup.inc"
+
+* People who donated money to GnuPG in 2017
+
+#+HTML: <ul>
+#+HTML: <!--BEGIN-DONATIONS-->
+#+HTML: <li>[please reload in a few minutes while the list is being updated]
+#+HTML: <!--END-DONATIONS-->
+#+HTML: </ul>
+
+#+HTML: <div id="smallnote">
+(* marks recurring donations)
+#+HTML: </div>
+
+
+
+  Thank you.
diff --git a/web/donate/kudos.org b/web/donate/kudos.org
index 960c1d9..50107df 100644
--- a/web/donate/kudos.org
+++ b/web/donate/kudos.org
@@ -89,7 +89,8 @@ the start of the Goteo campaign.
 
   Thank you.
 
-  - All donors to GnuPG in [[file:kudos-2016.org][2016]]
+  - All donors to GnuPG in [[file:kudos-2017.org][2017]]
+  - All donors to GnuPG in [[file:kudos-2015.org][2015]]
   - All donors to GnuPG in [[file:kudos-2015.org][2015]]
   - All donors to GnuPG in [[file:kudos-2014.org][2014]]
   - All donors to GnuPG in [[file:kudos-2013.org][2013]]

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

Summary of changes:
 tools/append-to-donors.sh                     | 23 ++++++++++++++++++-----
 web/donate/{kudos-2013.org => kudos-2017.org} | 14 ++++++++------
 web/donate/kudos.org                          |  3 ++-
 3 files changed, 28 insertions(+), 12 deletions(-)
 copy web/donate/{kudos-2013.org => kudos-2017.org} (59%)


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