[git] gnupg-doc - branch, master, updated. 0aa8486a58002afdf2b29ac5afac712c17884332

[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  0aa8486a58002afdf2b29ac5afac712c17884332 (commit)
      from  06cc385b60ff7b41f2b0242760cc5d87a77324f5 (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 0aa8486a58002afdf2b29ac5afac712c17884332
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 5 23:17:58 2017 +0200

    campaign: Print only the one-time donations since the new page is up.

diff --git a/tools/mkkudos.sh b/tools/mkkudos.sh
index 63ab4b9..b358643 100755
--- a/tools/mkkudos.sh
+++ b/tools/mkkudos.sh
@@ -190,6 +190,8 @@ dontable=$(awk -F: <"$donations" -v thisyear="$thisyear" '
 
 
 # Campaign data
+# Watchout for the 9074 below which are the donations received before the
+# campaign start.
 goal="120000"
 recur_goal="15000"
 percent=$(echo "$euroyr:$goal" | awk -F: '{ p = (int($1)*100)/int($2);
@@ -300,7 +302,7 @@ for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
      /<!--CMPGN-ONCE-EURO-->/ {
            n = index($0,"<!--CMPGN");
            printf "%s!--CMPGN-ONCE-EURO-->%s&#x202f;€\n",
-                  substr($0,1,n), format_number(euroyr);
+                  substr($0,1,n), format_number( int(euroyr) - 9074 );
            next
      }
      /<!--CMPGN-RECUR-COUNT-->/ {
diff --git a/web/donate/index.de.org b/web/donate/index.de.org
index 2049c87..572e8e3 100644
--- a/web/donate/index.de.org
+++ b/web/donate/index.de.org
@@ -139,7 +139,7 @@
               </h3>
 	      <h4>+
                 <!--CMPGN-ONCE-EURO-->
-                <small>an einmaligen Spenden in 2017</small>
+                <small>an einmaligen Spenden</small>
               </h4>
 	      <h4><!--CMPGN-RECUR-COUNT-->
                 <small>Unterstützer</small>
diff --git a/web/donate/index.org b/web/donate/index.org
index 4f76628..8c8dc4f 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -136,7 +136,7 @@
               </h3>
 	      <h4>+
                 <!--CMPGN-ONCE-EURO-->
-                <small>in one-time donations this year</small>
+                <small>in one-time donations</small>
               </h4>
 	      <h4><!--CMPGN-RECUR-COUNT-->
                 <small>Supporters</small>

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

Summary of changes:
 tools/mkkudos.sh        | 4 +++-
 web/donate/index.de.org | 2 +-
 web/donate/index.org    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


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