From 005ff4b106ad1dcfc0d8bbc645c4ab4eea30de7f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 6 Nov 2019 23:20:00 +0000 Subject: [PATCH] Donate button --- daemon.py | 7 ++++++- translations/ar.json | 3 ++- translations/ca.json | 3 ++- translations/cy.json | 3 ++- translations/de.json | 3 ++- translations/en.json | 3 ++- translations/es.json | 3 ++- translations/fr.json | 3 ++- translations/ga.json | 3 ++- translations/hi.json | 3 ++- translations/it.json | 3 ++- translations/ja.json | 3 ++- translations/pt.json | 3 ++- translations/ru.json | 3 ++- translations/zh.json | 3 ++- webinterface.py | 11 +++++++++-- 16 files changed, 43 insertions(+), 17 deletions(-) diff --git a/daemon.py b/daemon.py index 60b2ccff..53a3f539 100644 --- a/daemon.py +++ b/daemon.py @@ -139,6 +139,7 @@ from announce import outboxAnnounce from content import addHtmlTags from media import removeMetaData from cache import storePersonInCache +from cache import getPersonFromCache from httpsig import verifyPostHeaders import os import sys @@ -770,6 +771,10 @@ class PubServer(BaseHTTPRequestHandler): optionsLink=None if len(optionsList)>3: optionsLink=optionsList[3] + donateUrl=None + actorJson=getPersonFromCache(self.server.baseDir,optionsActor,self.server.personCache) + if actorJson: + donateUrl=getDonationUrl(actorJson) msg=htmlPersonOptions(self.server.translate, \ self.server.baseDir, \ self.server.domain, \ @@ -777,7 +782,7 @@ class PubServer(BaseHTTPRequestHandler): optionsActor, \ optionsProfileUrl, \ optionsLink, \ - pageNumber).encode() + pageNumber,donateUrl).encode() self._set_headers('text/html',len(msg),cookie) self._write(msg) self.server.GETbusy=False diff --git a/translations/ar.json b/translations/ar.json index aa58da38..6e5c8752 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/ca.json b/translations/ca.json index a3265810..39223918 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/cy.json b/translations/cy.json index 3a20e638..897c516e 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/de.json b/translations/de.json index fe857de9..a6091eaa 100644 --- a/translations/de.json +++ b/translations/de.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/en.json b/translations/en.json index 3aa6a2ec..51a334e6 100644 --- a/translations/en.json +++ b/translations/en.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/es.json b/translations/es.json index 8802e7d0..7a4b47f1 100644 --- a/translations/es.json +++ b/translations/es.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/fr.json b/translations/fr.json index 9e74f1f4..2d83c251 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/ga.json b/translations/ga.json index 5e2d38ae..aa442456 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/hi.json b/translations/hi.json index 436669c4..c3010174 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/it.json b/translations/it.json index d6107f66..3b9b12b0 100644 --- a/translations/it.json +++ b/translations/it.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/ja.json b/translations/ja.json index 046657cf..8770cbbe 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/pt.json b/translations/pt.json index 3bfb366e..b11d24c1 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/ru.json b/translations/ru.json index 5c375f86..a99208bf 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/translations/zh.json b/translations/zh.json index 2b4c924a..8ba00518 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -170,5 +170,6 @@ "Deactivate this account": "Deactivate this account", "Snooze": "Snooze", "Unsnooze": "Unsnooze", - "Donations link": "Donations link" + "Donations link": "Donations link", + "Donate": "Donate" } diff --git a/webinterface.py b/webinterface.py index b836a967..e1100822 100644 --- a/webinterface.py +++ b/webinterface.py @@ -2836,7 +2836,8 @@ def htmlPersonOptions(translate: {},baseDir: str, \ optionsActor: str, \ optionsProfileUrl: str, \ optionsLink: str, \ - pageNumber: int) -> str: + pageNumber: int, + donateUrl: str) -> str: """Show options for a person: view/follow/block/report """ optionsDomain,optionsPort=getDomainFromActor(optionsActor) @@ -2881,6 +2882,11 @@ def htmlPersonOptions(translate: {},baseDir: str, \ if isPersonSnoozed(baseDir,nickname,domain,optionsActor): snoozeButtonStr='Unsnooze' + donateStr='' + if donateUrl: + donateStr= \ + ' ' + optionsStr=htmlHeader(cssFilename,profileStyle) optionsStr+='
' optionsStr+='
' @@ -2894,7 +2900,8 @@ def htmlPersonOptions(translate: {},baseDir: str, \ ' ' \ ' '+ \ optionsLinkStr+ \ - ' ' \ + ' '+ \ + donateStr+ \ ' ' \ ' ' \ ' '+ \