Cron job and english translation. #2

Closed
mwoolweaver wants to merge 30 commits from cron-job into master
Showing only changes of commit f5f0a0644f - Show all commits

View File

@@ -31,7 +31,7 @@ if not (api_path, consumer_key, consumer_key, consumer_secret, access_token, acc
def comma_value(num): def comma_value(num):
"""Helper function for thousand separators""" """Helper function for thousand separators"""
return "{:,}".format(int(num)).replace(',', '.') return "{:,}".format(int(num)).replace(',', ',')
def get_api(): def get_api():
@@ -66,11 +66,11 @@ def get_pihole_data():
def construct_tweet(data): def construct_tweet(data):
today = datetime.today().strftime("%d.%m.%Y") today = datetime.today().strftime("%d.%m.%Y")
tweet = 'Pi-Hole-Statistik für den {date}:\n'.format(date=today) tweet = 'Pi-hole statistics for {date}:\n'.format(date=today)
tweet += 'Blockierte Werbung: ' + str(comma_value(data['ads_blocked_today'])) tweet += 'Ads Blocked: ' + str(comma_value(data['ads_blocked_today']))
tweet += ' (' + str(round(data['ads_percentage_today'], 2)).replace('.', ',') + ' %)\n' tweet += ' (' + str(round(data['ads_percentage_today'], 2)).replace('.', ',') + ' %)\n'
tweet += 'DNS-Abfragen: ' + str(comma_value(data['dns_queries_today'])) + '\n' tweet += 'Total DNS Queries: ' + str(comma_value(data['dns_queries_today'])) + '\n'
tweet += 'Domains auf der Blacklist: ' + str(comma_value(data['domains_being_blocked'])) tweet += 'Domains on Blocklist: ' + str(comma_value(data['domains_being_blocked']))
return tweet return tweet