gnucash-htdocs master: Split OS name and version again for optical reasons

[Frank H.Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/cd1d672e (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/985a9749 (commit)



commit cd1d672ee27df15d5ffa7ce8dcf308842735e731
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Dec 19 21:47:33 2021 +0100

    Split OS name and version again for optical reasons

diff --git a/download.phtml b/download.phtml
index ea16d28..e87ee86 100644
--- a/download.phtml
+++ b/download.phtml
@@ -20,9 +20,9 @@
   <p class="justify"><?php printf (T_("The latest stable release of <span class=\"gnucash\">GnuCash</span> is %s. Choose the download for your operating system below."), $latest_stable)?></p>
 
   <h3><?php echo T_("Installers")?></h3>
-  <ul class="imagelist">
-    <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/windows.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $latest_stable_path.$latest_stable_win;?>"><?=\SUPPORTED_WIN?></a></li>
-    <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/macosx.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $latest_stable_path.$latest_stable_mac_intel;?>"><?=\SUPPORTED_MAC?></a></li>
+  <ul class="imagelist"><!-- ToDo: merge concat into format on next patch-po session -->
+    <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/windows.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <?=\LABEL_WIN?> <a href="<?php echo $latest_stable_path.$latest_stable_win;?>"><?=\SUPPORTED_WIN?></a></li>
+    <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/macosx.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <?=\LABEL_MAC?> <a href="<?php echo $latest_stable_path.$latest_stable_mac_intel;?>"><?=\SUPPORTED_MAC?></a></li>
   </ul>
 
   <a id="distribution"></a><h3>Linux</h3>
@@ -65,8 +65,8 @@
       <p class="justify"><?php printf (T_("The latest unstable release of <span class=\"gnucash\">GnuCash</span> is %s.  Choose the download for your operating system below."), $latest_unstable)?></p>
       
       <ul>
-        <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> <a href="<?php echo $latest_unstable_path.$latest_unstable_win;?>"><?=\SUPPORTED_WIN?></a></li>
-        <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> Mac OS X <a href="<?php echo $latest_unstable_path.$latest_unstable_mac_intel;?>"><?=\SUPPORTED_MAC?></a></li>
+        <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> <?=\LABEL_WIN?> <a href="<?php echo $latest_unstable_path.$latest_unstable_win;?>"><?=\SUPPORTED_WIN?></a></li>
+        <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> <?=\LABEL_MAC?> <a href="<?php echo $latest_unstable_path.$latest_unstable_mac_intel;?>"><?=\SUPPORTED_MAC?></a></li>
         <li><a href="<?php echo $latest_unstable_path.$latest_unstable_source;?>">bzip2 compressed tarball</a> <?php printf (T_("for GnuCash %s"), $latest_unstable)?></li>
       </ul>
   <?php } ?>
diff --git a/externals/global_params.php b/externals/global_params.php
index 88e1724..1f03078 100644
--- a/externals/global_params.php
+++ b/externals/global_params.php
@@ -33,8 +33,10 @@
      $old_stable_mac_intel  = $old_stable."-1";
 
      // Supported targets:
-     define("SUPPORTED_WIN", "Microsoft Windows 8/10/11");
-     define("SUPPORTED_MAC", "Apple macOS  ≥ 10.13—\"High Sierra\"");
+     define("LABEL_WIN", "Microsoft Windows");
+     define("LABEL_MAC", "Apple macOS");
+     define("SUPPORTED_WIN", "8/10/11");
+     define("SUPPORTED_MAC", "≥ 10.13—\"High Sierra\"");
      // Frozen versions:
      $show_historical = True;
      $last_win7_version = "3.11"; //Still used in download block on index.phtml
diff --git a/index.phtml b/index.phtml
index 18f4407..3b13ec3 100644
--- a/index.phtml
+++ b/index.phtml
@@ -16,10 +16,10 @@ include ("externals/menu.phtml");
           <li><img alt="linux" src="<?=$top_dir?>/images/icons/linux.png" />
             Linux <a href="<?=$latest_stable_path.$latest_stable_source?>"><?=T_("Source code")?></a>
             | <a href="<?=$home?>/download.phtml#distribution"><?=T_("Via distribution")?></a></li>
-          <li><img alt="windows" src="<?=$top_dir?>/images/icons/windows.png" />
+          <li><img alt="windows" src="<?=$top_dir?>/images/icons/windows.png" /> <?=\LABEL_WIN?>
             <a
             href="<?=$latest_stable_path.$latest_stable_win?>"><?=\SUPPORTED_WIN?></a></li>
-          <li><img alt="macosx" src="<?=$top_dir?>/images/icons/macosx.png" />
+          <li><img alt="macosx" src="<?=$top_dir?>/images/icons/macosx.png" /> <?=\LABEL_MAC?>
             <a
             href="<?=$latest_stable_path.$latest_stable_mac_intel?>"><?=\SUPPORTED_MAC?></a></li>
           <li><a href="<?=$home?>/download.phtml" style="font-size: 80%;"><?=T_("More downloads (Source code, Development …)")?></a></li>



Summary of changes:
 download.phtml              | 10 +++++-----
 externals/global_params.php |  6 ++++--
 index.phtml                 |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)