Link to internal release notes and drop generated ones

vkbo · Feb 13, 2024 · 33705e5 · 33705e5
1 parent 1e4c542
commit 33705e5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 33 deletions.
diff --git a/source/generated/download_block.rst b/source/generated/download_block.rst
@@ -1,9 +1,7 @@
 Latest Release
 ==============
 
-.. _Release Notes: https://github.com/vkbo/novelWriter/releases/tag/v2.2.1
-
-**Version 2.2.1** -- Released on January 27, 2024 -- :octicon:`mark-github` `Release Notes`_
+**Version 2.2.1** -- Released on January 27, 2024 -- Read the :ref:`Release Notes <main_release_2_2>`
 
 .. grid:: 1 1 3 3
    :margin: 4 4 0 0

diff --git a/source/generated/download_release.rst b/source/generated/download_release.rst
@@ -6,27 +6,8 @@
 
 | **Release Version:** Version 2.2.1
 | **Release Date:** January 27, 2024
-| **Release Page:** :octicon:`mark-github` `GitHub <https://github.com/vkbo/novelWriter/releases/tag/v2.2.1>`__
-
-.. dropdown:: Release Notes
-   :animate: fade-in-slide-down
-   :icon: info
-
-   This is a patch release that fixes an issue where the Project View would sometimes switch to the Novel View when a new item was created. This patch also includes updated translations for German and Chinese.
-
-.. dropdown:: Detailed Changelog
-   :animate: fade-in-slide-down
-   :icon: tasklist
-
-   **Bugfixes**
-
-   * Fix a bug in the toggle for the tree view on the left would trigger each time a new project item was created. Issue `#1649 <https://github.com/vkbo/novelWriter/issues/1649>`_. PR `#1648 <https://github.com/vkbo/novelWriter/issues/1648>`_.
-   * Fix an issue where multiple Manuscript and Writing Stats dialogs could be opened. PR `#1671 <https://github.com/vkbo/novelWriter/issues/1671>`_.
-
-   **Internationalisation**
-
-   * Updated German translation, by @HeyMyian. PR `#1666 <https://github.com/vkbo/novelWriter/issues/1666>`_.
-   * Updated Chinese translation, by @ruixuan658 and @longqzh. PR `#1666 <https://github.com/vkbo/novelWriter/issues/1666>`_.
+| **Release Notes:** :ref:`main_release_2_2`
+| **GitHub Release:** :octicon:`mark-github` `GitHub <https://github.com/vkbo/novelWriter/releases/tag/v2.2.1>`__
 
 Linux
 -----

diff --git a/templates/download_block.rst b/templates/download_block.rst
@@ -1,9 +1,7 @@
 Latest Release
 ==============
 
-.. _Release Notes: {release_url}
-
-**{release_version}** -- Released on {release_date} -- :octicon:`mark-github` `Release Notes`_
+**{release_version}** -- Released on {release_date} -- Read the :ref:`Release Notes <{release_ref}>`
 
 .. grid:: 1 1 3 3
    :margin: 4 4 0 0

diff --git a/templates/download_release.rst b/templates/download_release.rst
@@ -6,7 +6,7 @@
 
 | **Release Version:** {release_version}
 | **Release Date:** {release_date}
-| **Release Page:** :octicon:`mark-github` `GitHub <{release_url}>`__
+| **Release Notes:** :ref:`{release_ref}`
+| **GitHub Release:** :octicon:`mark-github` `GitHub <{release_url}>`__
 
-{release_notes}
 {download_tabs}
diff --git a/update.py b/update.py
@@ -135,7 +135,7 @@ def pullRelease(args):
     releaseVersion = data.get("name", "Version ???")
     releaseDate = data.get("published_at", "")
     shortVersion = data.get("tag_name", "???").lstrip("v")
-    releaseNotes = data.get("body", "")
+    releaseRef = "main_release_" + "_".join(shortVersion.split(".")[:2])
     isPreRelease = data.get("prerelease", False)
     tarBall = data.get("tarball_url", "")
     zipBall = data.get("zipball_url", "")
@@ -166,7 +166,7 @@ def pullRelease(args):
             "release_version": releaseVersion,
             "release_date": releaseDateFmt,
             "release_url": releaseUrl,
-            "release_notes": processReleaseNotes(releaseNotes),
+            "release_ref": releaseRef,
             "download_tabs": assets.generateDownloadTabs(
                 f"novelWriter-{shortVersion}.zip", zipBall,
                 f"novelWriter-{shortVersion}.tar.gz", tarBall
@@ -178,7 +178,7 @@ def pullRelease(args):
         buildFromTemplate("download_block.rst", "download_block.rst", {
             "release_version": releaseVersion,
             "release_date": releaseDateFmt,
-            "release_url": releaseUrl,
+            "release_ref": releaseRef,
             "appimage_download": aAppImg.assetUrl,
             "debian_download": aDebian.assetUrl,
             "winexe_download": aWinExe.assetUrl,
@@ -204,7 +204,7 @@ def pullRelease(args):
             "release_version": releaseVersion,
             "release_date": releaseDateFmt,
             "release_url": releaseUrl,
-            "release_notes": processReleaseNotes(releaseNotes),
+            "release_ref": releaseRef,
             "download_tabs": assets.generateDownloadTabs(
                 f"novelWriter-{shortVersion}.zip", zipBall,
                 f"novelWriter-{shortVersion}.tar.gz", tarBall