Merge remote-tracking branch 'origin/master'

docs/admin/config.rst

@@ -338,6 +338,21 @@ This is recommended setup for production use.
 
 .. seealso:: :ref:`fulltext`
 
+.. setting:: PIWIK_SITE_ID
+
+PIWIK_SITE_ID
+-------------
+
+ID of a site in Piwik you want to track.
+
+.. setting:: PIWIK_URL
+
+PIWIK_URL
+---------
+
+URL of a Piwik installation you want to use to track Weblate users. For more
+information about Piwik see <http://piwik.org/>.
+
 .. setting:: PRE_COMMIT_SCRIPTS
 
 PRE_COMMIT_SCRIPTS

weblate/appsettings.py

@@ -159,6 +159,10 @@ REGISTRATION_OPEN = getvalue('REGISTRATION_OPEN', True)
 # Captcha for registrations
 REGISTRATION_CAPTCHA = getvalue('REGISTRATION_CAPTCHA', True)
 
+# Piwik
+PIWIK_SITE_ID = getvalue('PIWIK_SITE_ID', None)
+PIWIK_URL = getvalue('PIWIK_URL', None)
+
 # Source language
 SOURCE_LANGUAGE = getvalue('SOURCE_LANGUAGE', 'en')
 

weblate/html/footer.html

@@ -10,3 +10,25 @@
   <li><a href="{{ donate_url }}">{% trans "Donate to Weblate!" %}</a></li>
  </ul>
 </footer>
+
+{% if piwik_site_id and piwik_url %}
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//{{ piwik_url }}/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', {{ piwik_site_id }}]);
+    _paq.push(['setCustomVariable', 1, 'Language', '{{ LANGUAGE_CODE }}', 'page']);
+    {% if project %}
+    _paq.push(['setCustomVariable', 2, 'Project', '{{ project.name }}', 'page']);
+    {% endif %}
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//{{ piwik_url }}/piwik.php?idsite={{ piwik_site_id }}" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
+{% endif %}

weblate/trans/context_processors.py

@@ -64,6 +64,9 @@ def weblate_context(request):
         'enable_avatars': appsettings.ENABLE_AVATARS,
         'enable_sharing': appsettings.ENABLE_SHARING,
 
+        'piwik_site_id': appsettings.PIWIK_SITE_ID,
+        'piwik_url': appsettings.PIWIK_URL,
+
         'current_date': datetime.utcnow().strftime('%Y-%m-%d'),
         'current_year': datetime.utcnow().strftime('%Y'),
         'current_month': datetime.utcnow().strftime('%m'),

weblate/trans/views/basic.py

@@ -239,6 +239,7 @@ def show_project(request, project):
         'project.html',
         {
             'object': obj,
+            'project': obj,
             'dicts': dicts,
             'last_changes': last_changes,
             'last_changes_rss': reverse(
@@ -267,6 +268,7 @@ def show_subproject(request, project, subproject):
         'subproject.html',
         {
             'object': obj,
+            'project': obj.project,
             'translations': obj.translation_set.enabled(),
             'show_language': 1,
             'last_changes': last_changes,
@@ -318,6 +320,7 @@ def show_translation(request, project, subproject, lang):
         'translation.html',
         {
             'object': obj,
+            'project': obj.subproject.project,
             'form': form,
             'autoform': autoform,
             'search_form': search_form,
@@ -439,6 +442,7 @@ def data_project(request, project):
         'data.html',
         {
             'object': obj,
+            'project': obj,
             'hooks_docs': weblate.get_doc_url('api', 'hooks'),
             'api_docs': weblate.get_doc_url('api', 'exports'),
             'rss_docs': weblate.get_doc_url('api', 'rss'),

weblate/trans/views/edit.py

@@ -568,6 +568,7 @@ def translate(request, project, subproject, lang):
             'next_unit_url': next_unit_url,
             'prev_unit_url': base_unit_url + str(offset - 1),
             'object': translation,
+            'project': translation.subproject.project,
             'unit': unit,
             'others': Unit.objects.same(unit).exclude(target=unit.target),
             'total': translation.unit_set.all().count(),
@@ -738,6 +739,7 @@ def zen(request, project, subproject, lang):
         'zen.html',
         {
             'object': translation,
+            'project': translation.subproject.project,
             'unitdata': unitdata,
             'search_query': search_result['query'],
             'filter_name': search_result['name'],