From 4ed413eaa7becbc7755d5ee3592e468548119132 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 30 Jun 2022 17:00:14 +0530
Subject: [PATCH] Switch to GA2

---
 docs/_templates/base.html | 18 +++++++-----------
 publish.py                |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/docs/_templates/base.html b/docs/_templates/base.html
index daa2bdace..33190a9e5 100644
--- a/docs/_templates/base.html
+++ b/docs/_templates/base.html
@@ -4,18 +4,14 @@
   {{ super() }}
 
   {%- if analytics_id %}
-      <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', '{{ analytics_id }}']);
-      _gaq.push(['_setDomainName', 'none']);
-      _gaq.push(['_setAllowLinker', true]);
-      _gaq.push(['_trackPageview']);
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ analytics_id }}"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
 
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+        gtag('config', '{{ analytics_id }}');
     </script>
   {% endif -%}
 
diff --git a/publish.py b/publish.py
index a2933d673..4075491dd 100755
--- a/publish.py
+++ b/publish.py
@@ -92,7 +92,7 @@ def run_man(args: Any) -> None:
 
 
 def run_html(args: Any) -> None:
-    call('make FAIL_WARN=1 "OPTS=-D analytics_id=UA-20736318-2" dirhtml', cwd=docs_dir)
+    call('make FAIL_WARN=1 "OPTS=-D analytics_id=G-XTJK3R7GF2" dirhtml', cwd=docs_dir)
     add_old_redirects('docs/_build/dirhtml')