[tor-commits] [tpo/master] Support distinct Windows Tor Browser version

[sysrqb at torproject.org]

commit 2b9fd5da8ad5f5302e68883f37769d5328bbcb86
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sun Feb 7 16:00:03 2021 +0000

    Support distinct Windows Tor Browser version
---
 templates/download-languages.html | 3 ++-
 templates/download-options.html   | 3 ++-
 templates/hero-download.html      | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/download-languages.html b/templates/download-languages.html
index 4f7ec025..f80fae66 100644
--- a/templates/download-languages.html
+++ b/templates/download-languages.html
@@ -16,12 +16,13 @@
       </thead>
       <tbody>
         {% set t = bag('versions', 'torbrowser-stable') %}
+        {% set t_win = bag('versions', 'torbrowser-win-stable') %}
         {% for id, item in bag('download-alternatives').items() %}
           <tr>
             <td>{{ item.language }}</td>
             <td>
               {% from "macros/downloads.html" import render_windows %}
-              {{ render_windows(t.version, id) }}
+              {{ render_windows(t_win.version, id) }}
             </td>
             <td>
               {% from "macros/downloads.html" import render_mac %}
diff --git a/templates/download-options.html b/templates/download-options.html
index 2c206df5..3caa64ea 100644
--- a/templates/download-options.html
+++ b/templates/download-options.html
@@ -16,12 +16,13 @@
       </thead>
       <tbody>
         {% set t = bag('versions', 'torbrowser-alpha') %}
+        {% set t_win = bag('versions', 'torbrowser-win-alpha') %}
         {% for id, item in bag('download-alternatives-alpha').items() %}
           <tr>
             <td>{{ item.language }}</td>
             <td>
               {% from "macros/downloads.html" import render_windows %}
-              {{ render_windows(t.version, id) }}
+              {{ render_windows(t_win.version, id) }}
             </td>
             <td>
               {% from "macros/downloads.html" import render_mac %}
diff --git a/templates/hero-download.html b/templates/hero-download.html
index c79d90d7..c6b0833b 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -17,6 +17,8 @@
           {% set alt_l = 'es-ES' %}
         {% endif %}
         {% if id == 'windows' %}
+          {% set t = bag('versions', 'torbrowser-win-stable') %}
+          {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %}
           {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt_l + '.exe' %}
           {% set sig_link = download_link + '.asc' %}
         {% elif id == 'apple' %}