Merge branch 'dropstats'

This commit is contained in:
Saivann 2015-05-31 22:51:08 -04:00
commit 5208c0a832
3 changed files with 1 additions and 18 deletions

View file

@ -1,15 +0,0 @@
#!/bin/bash
# This file is licensed under the MIT License (MIT) available on
# http://opensource.org/licenses/MIT.
# bitcoinstats.rb can be found here:
# https://github.com/saivann/bitcoinstats
WORKDIR='/bitcoin.org/stats'
LOGDIR='build@bitcoinorglog:/var/log/nginx'
DSTDIR='build@bitcoinorgstats:/var/www/stats'
rsync -rtz --delete --exclude="error.*" --exclude="*.gz" $LOGDIR/ $WORKDIR/srclogs/
ruby $WORKDIR/stats.rb
rsync -rtz --delete $WORKDIR/stats/ $DSTDIR/

View file

@ -85,7 +85,6 @@
<div class="footer"> <div class="footer">
<div class="footermenu"> <div class="footermenu">
<a href="/en/alerts" class="statusmenu{% if site.STATUS == 1 %} alert{% endif %}">Network Status</a> <a href="/en/alerts" class="statusmenu{% if site.STATUS == 1 %} alert{% endif %}">Network Status</a>
<a href="/stats/">{% translate menu-stats layout %}</a>
<a href="/{{ page.lang }}/{% translate legal url %}">{% translate menu-legal layout %}</a> <a href="/{{ page.lang }}/{% translate legal url %}">{% translate menu-legal layout %}</a>
{% case page.lang %} {% case page.lang %}
{% when 'ar' or 'es' or 'sl' %} {% when 'ar' or 'es' or 'sl' %}

View file

@ -522,7 +522,7 @@ en:
datacollect: "Data collected" datacollect: "Data collected"
datacollecttxt: "Bitcoin.org collects anonymized server logs. These logs include IP addresses with replaced last byte, time of the visit, requested page, user agent and referer url. Bitcoin.org does not collect data using cookies." datacollecttxt: "Bitcoin.org collects anonymized server logs. These logs include IP addresses with replaced last byte, time of the visit, requested page, user agent and referer url. Bitcoin.org does not collect data using cookies."
datause: "Usage of data" datause: "Usage of data"
datausetxt: "Collected data is used to provide <a href=\"/stats/\">transparent public stats</a>." datausetxt: "Collected data may be used to provide transparent public stats."
protect-your-privacy: protect-your-privacy:
title: "Protect your privacy - Bitcoin" title: "Protect your privacy - Bitcoin"
pagetitle: "Protect your privacy" pagetitle: "Protect your privacy"
@ -693,7 +693,6 @@ en:
menu-press: "Press" menu-press: "Press"
menu-privacy: "Privacy" menu-privacy: "Privacy"
menu-resources: Resources menu-resources: Resources
menu-stats: "Stats"
menu-support-bitcoin: "Support Bitcoin" menu-support-bitcoin: "Support Bitcoin"
menu-vocabulary: Vocabulary menu-vocabulary: Vocabulary
menu-you-need-to-know: "You need to know" menu-you-need-to-know: "You need to know"