From 90d42362f52ebceb0091c9ad8992f0420a6995d0 Mon Sep 17 00:00:00 2001
From: Akbar Abdrakhmanov <kz.akbar@gmail.com>
Date: Mon, 16 Oct 2023 19:50:20 +0600
Subject: [PATCH 1/2] enable 23.10 desktop download button/link, update
 checksum for desktop image

---
 releases.yaml                                 |  3 ++-
 templates/download/alternative-downloads.html | 11 +++--------
 templates/download/desktop/index.html         | 10 ++--------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/releases.yaml b/releases.yaml
index 816dfa1f55c..97730d39626 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -3,6 +3,7 @@ latest:
   name: "Mantic Minotaur"
   short_version: "23.10"
   full_version: "23.10"
+  desktop_version: "23.10.1"
   core_version: "23"
   release_date: "October 2023"
   eol: "July 2024"
@@ -31,7 +32,7 @@ openstack_lts:
 
 checksums:
   desktop:
-    "23.10": "444c8a7b993cb6f103d7df1144954064889cbf7491b2415518d5dd0875e3a96f *ubuntu-23.10-desktop-amd64.iso"
+    "23.10.1": "3b6c5275366d02160554fa5703add462da3b8ce9be1749f8806e8dbbffaa2b5a *ubuntu-23.10.1-desktop-amd64.iso"
     "22.04.3": "a435f6f393dda581172490eda9f683c32e495158a780b5a1de422ee77d98e909 *ubuntu-22.04.3-desktop-amd64.iso"
     "21.10": "f8d3ab0faeaecb5d26628ae1aa21c9a13e0a242c381aa08157db8624d574b830 *ubuntu-21.10-desktop-amd64.iso"
     "20.04.6": "510ce77afcb9537f198bc7daa0e5b503b6e67aaed68146943c231baeaab94df1 *ubuntu-20.04.6-desktop-amd64.iso"
diff --git a/templates/download/alternative-downloads.html b/templates/download/alternative-downloads.html
index 0fed80295ea..4b02da32bb6 100755
--- a/templates/download/alternative-downloads.html
+++ b/templates/download/alternative-downloads.html
@@ -55,14 +55,9 @@ <h2 id="bittorrent">BitTorrent</h2>
       <h3 class="p-heading--4"><span>Ubuntu {{ releases.latest.full_version }}</span></h3>
       <ul class="p-list--divided">
         <li class="p-list__item">
-          {# <a class="download-torrent"
-            href="https://releases.ubuntu.com/{{ releases.latest.short_version }}/ubuntu-{{ releases.latest.full_version }}-desktop-amd64.iso.torrent">Ubuntu
-            {{ releases.latest.full_version }} Desktop (64-bit)</a> #}
-          <p class="p-form-help-text u-no-margin--bottom">Ubuntu 23.10 Desktop cannot be
-            downloaded right now. We apologize while we work on <a
-              href="https://discourse.ubuntu.com/t/announcement-ubuntu-desktop-23-10-release-image-is-being-updated-to-resolve-a-malicious-translation-incident/39365">correcting
-              the issue.</a>
-          </p>
+          <a class="download-torrent"
+            href="https://releases.ubuntu.com/{{ releases.latest.desktop_version }}/ubuntu-{{ releases.latest.desktop_version }}-desktop-amd64.iso.torrent">Ubuntu
+            {{ releases.latest.full_version }} Desktop (64-bit)</a>
         </li>
         <li class="p-list__item">
           <a class="download-torrent"
diff --git a/templates/download/desktop/index.html b/templates/download/desktop/index.html
index 0a64c89f9b1..9dbae176269 100644
--- a/templates/download/desktop/index.html
+++ b/templates/download/desktop/index.html
@@ -87,18 +87,12 @@ <h2>Ubuntu {{ releases.latest.full_version }}</h2>
         }}
       </div>
       <p>
-        <a class="p-button--positive is-wide is-disabled u-no-margin--bottom"
-          aria-describedby="downloadButtonHelpMessage" style="pointer-events: none"
-          href="/download/desktop/thank-you?version={{ releases.latest.full_version }}&amp;architecture=amd64"
+        <a class="p-button--positive is-wide"
+          href="/download/desktop/thank-you?version={{ releases.latest.desktop_version }}&amp;architecture=amd64"
           onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Desktop', 'eventLabel' : '{{ releases.latest.short_version }}', 'eventValue' : undefined });">
           Download {{ releases.latest.full_version }}
         </a>
         <script>performance.mark("Download (Desktop) button rendered")</script>
-      <p class="p-form-help-text" id="downloadButtonHelpMessage">Ubuntu 23.10 cannot be downloaded right now. We
-        apologize while we work on <a
-          href="https://discourse.ubuntu.com/t/announcement-ubuntu-desktop-23-10-release-image-is-being-updated-to-resolve-a-malicious-translation-incident/39365">correcting
-          the issue.</a>
-      </p>
       </p>
       <p>
         <a href="https://cdimage.ubuntu.com/releases/mantic/release/ubuntu-{{ releases.latest.short_version }}-desktop-legacy-amd64.iso"

From 0015be96108d4173f73980a4b75a0eb53db1cdd7 Mon Sep 17 00:00:00 2001
From: Akbar Abdrakhmanov <kz.akbar@gmail.com>
Date: Mon, 16 Oct 2023 22:05:10 +0600
Subject: [PATCH 2/2] add comment to 23.10.1 Desktop image version in releases
 config

---
 releases.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releases.yaml b/releases.yaml
index 97730d39626..a8545b815d4 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -3,7 +3,7 @@ latest:
   name: "Mantic Minotaur"
   short_version: "23.10"
   full_version: "23.10"
-  desktop_version: "23.10.1"
+  desktop_version: "23.10.1" # for 23.10 release only, because Desktop image for 23.10 release has version 23.10.1, while as all other images have version 23.10
   core_version: "23"
   release_date: "October 2023"
   eol: "July 2024"