Merge remote-tracking branch 'origin/master'

weblate/html/footer.html

@@ -15,16 +15,16 @@
 <!-- Piwik -->
 <script type="text/javascript">
   var _paq = _paq || [];
+  _paq.push(['setCustomVariable', 1, 'Language', '{{ LANGUAGE_CODE }}', 'page']);
+  {% if project %}
+  _paq.push(['setCustomVariable', 2, 'Project', '{{ project.name }}', 'page']);
+  {% endif %}
   _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);
   })();