- Add architecture column to download table

- Update Japanese Translation
WinMerge · Jul 21, 2024 · 12033c3 · 12033c3
1 parent d04cd43
commit 12033c3
Show file tree

Hide file tree

Showing 23 changed files with 5,611 additions and 5,282 deletions.
diff --git a/htdocs/downloads/index.php b/htdocs/downloads/index.php
@@ -19,54 +19,63 @@
   <table class="table is-striped">
     <tr>
       <th class="left"><?php __e('Download');?></th>
+      <th class="center"><?php __e('Architecture');?></th>
       <th class="center"><?php __e('Size');?></th>
       <th class="center"><?php __e('Type');?></th>
       <th class="center"><?php __e('Format');?></th>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('setup64.exe');?>" target="_blank" class="button"><?php echo $stablerelease->getDownloadFileName('setup64.exe');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('setup64.exe');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('setup64.exe'));?></td>
       <td class="center"><?php __e('Installer');?></td>
       <td class="center"><?php __e('EXE');?></td>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('setup64peruser.exe');?>" target="_blank" class="button is-dark"><?php echo $stablerelease->getDownloadFileName('setup64peruser.exe');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('setup64peruser.exe');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('setup64peruser.exe'));?></td>
       <td class="center"><?php __e('Per-user installer');?></td>
       <td class="center"><?php __e('EXE');?></td>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('setuparm64.exe');?>" target="_blank" class="button is-dark"><?php echo $stablerelease->getDownloadFileName('setuparm64.exe');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('setuparm64.exe');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('setuparm64.exe'));?></td>
       <td class="center"><?php __e('Installer');?></td>
       <td class="center"><?php __e('EXE');?></td>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('setup.exe');?>" target="_blank" class="button is-dark"><?php echo $stablerelease->getDownloadFileName('setup.exe');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('setup.exe');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('setup.exe'));?></td>
       <td class="center"><?php __e('Installer');?></td>
       <td class="center"><?php __e('EXE');?></td>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('exe64.zip');?>" target="_blank" class="button is-dark"><?php echo $stablerelease->getDownloadFileName('exe64.zip');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('exe64.zip');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('exe64.zip'));?></td>
       <td class="center"><?php __e('Binaries');?></td>
       <td class="center"><?php __e('ZIP');?></td>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('exearm64.zip');?>" target="_blank" class="button is-dark"><?php echo $stablerelease->getDownloadFileName('exearm64.zip');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('exearm64.zip');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('exearm64.zip'));?></td>
       <td class="center"><?php __e('Binaries');?></td>
       <td class="center"><?php __e('ZIP');?></td>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('exe.zip');?>" target="_blank" class="button is-dark"><?php echo $stablerelease->getDownloadFileName('exe.zip');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('exe.zip');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('exe.zip'));?></td>
       <td class="center"><?php __e('Binaries');?></td>
       <td class="center"><?php __e('ZIP');?></td>
     </tr>
     <tr>
       <td class="left"><a href="<?php echo $stablerelease->getDownload('src.7z');?>" target="_blank" class="button is-light"><?php echo $stablerelease->getDownloadFileName('src.7z');?></a></td>
+      <td class="center"><?php echo $stablerelease->getDownloadArch('src.7z');?></td>
       <td class="center"><?php __e('%s MB', $stablerelease->getDownloadSizeMb('src.7z'));?></td>
       <td class="center"><?php __e('Source Code');?></td>
       <td class="center"><?php __e('7z');?></td>

diff --git a/htdocs/engine/page.inc b/htdocs/engine/page.inc
@@ -45,14 +45,14 @@
       $this->_stablerelease = new Release;
       $this->_stablerelease->setVersionNumber('2.16.40');
       $this->_stablerelease->setDate('2024-04-27');
-      $this->_stablerelease->addDownload('setup.exe', 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-Setup.exe', 9328920, 'd90ee78b59f07651372ec976f0a4da2e860129f04440380df7828c19eb5e1030');
-      $this->_stablerelease->addDownload('setup64.exe', 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-x64-Setup.exe', 9909272, 'c76bcfdd5025059f398e94f97d801a4a6cf52bef5b86f88209dcdffb28a141cd');
-      $this->_stablerelease->addDownload('setup64peruser.exe', 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-x64-PerUser-Setup.exe', 9909288, 'c2ee74723bddccc987587f6162558b4ad6e1b3750abdd83c197eee1a3f082ad9');
-      $this->_stablerelease->addDownload('setuparm64.exe', 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-ARM64-Setup.exe', 10733640, '6e85febd0c5867a831dd402325a94504975f0b9e668bb0d5f8f3c7262b149847');
-      $this->_stablerelease->addDownload('exe.zip', 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-exe.zip', 12016671, 'd960c9749f6c74dc7f43c45328d60c7f6e376e3cb37854157e8ccc95c5445ba7');
-      $this->_stablerelease->addDownload('exe64.zip', 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-x64-exe.zip', 12845561, '044d02b0b93c8ade880946a9afa1e476f4c9cdd740c299168b1e09878ed15337');
-      $this->_stablerelease->addDownload('exearm64.zip', 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-ARM64-exe.zip', 12237390, 'ce10e978bc0f8445e7a66b84fb56d9893ece036d79e9c70719453c374e2559bc');
-      $this->_stablerelease->addDownload('src.7z', 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-full-src.7z', 15569481, '487ae4276a526ddbe827aec8c2adda792b34fce2e4acc60fb4d3c4e793c11d65');
+      $this->_stablerelease->addDownload('setup.exe', __('x86 (32-bit)'), 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-Setup.exe', 9328920, 'd90ee78b59f07651372ec976f0a4da2e860129f04440380df7828c19eb5e1030');
+      $this->_stablerelease->addDownload('setup64.exe', __('x64 (64-bit)'), 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-x64-Setup.exe', 9909272, 'c76bcfdd5025059f398e94f97d801a4a6cf52bef5b86f88209dcdffb28a141cd');
+      $this->_stablerelease->addDownload('setup64peruser.exe', __('x64 (64-bit)'), 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-x64-PerUser-Setup.exe', 9909288, 'c2ee74723bddccc987587f6162558b4ad6e1b3750abdd83c197eee1a3f082ad9');
+      $this->_stablerelease->addDownload('setuparm64.exe', __('ARM64 (64-bit)'), 'https://downloads.sourceforge.net/winmerge/WinMerge-2.16.40-ARM64-Setup.exe', 10733640, '6e85febd0c5867a831dd402325a94504975f0b9e668bb0d5f8f3c7262b149847');
+      $this->_stablerelease->addDownload('exe.zip', __('x86 (32-bit)'), 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-exe.zip', 12016671, 'd960c9749f6c74dc7f43c45328d60c7f6e376e3cb37854157e8ccc95c5445ba7');
+      $this->_stablerelease->addDownload('exe64.zip', __('x64 (64-bit)'), 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-x64-exe.zip', 12845561, '044d02b0b93c8ade880946a9afa1e476f4c9cdd740c299168b1e09878ed15337');
+      $this->_stablerelease->addDownload('exearm64.zip', __('ARM64 (64-bit)'), 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-ARM64-exe.zip', 12237390, 'ce10e978bc0f8445e7a66b84fb56d9893ece036d79e9c70719453c374e2559bc');
+      $this->_stablerelease->addDownload('src.7z', '-', 'https://downloads.sourceforge.net/winmerge/winmerge-2.16.40-full-src.7z', 15569481, '487ae4276a526ddbe827aec8c2adda792b34fce2e4acc60fb4d3c4e793c11d65');
       $this->_stablerelease->setReleaseNotes('https://github.com/WinMerge/winmerge/releases/tag/v2.16.40');
       $this->_stablerelease->setKnownIssues('https://github.com/WinMerge/winmerge/releases/tag/v2.16.40#known-issues');
       $this->_stablerelease->setChangeLog('https://github.com/WinMerge/winmerge/blob/v2.16.40/Docs/Users/ChangeLog.md');

diff --git a/htdocs/engine/release.inc b/htdocs/engine/release.inc
@@ -25,6 +25,7 @@
       $this->_versionnumber = '';
       $this->_date = '';
       $this->_downloads = array();
+      $this->_downloadarch = array();
       $this->_downloadsizes = array();
       $this->_downloadsha256sums = array();
       $this->_releasenotes = '';
@@ -71,8 +72,9 @@
     /**
      * add a download from the release
      */
-    function addDownload($id, $url, $size, $sha256 = '') {
+    function addDownload($id, $arch, $url, $size, $sha256 = '') {
       $this->_downloads[$id] = $url;
+      $this->_downloadarch[$id] = $arch;
       $this->_downloadsizes[$id] = $size;
       $this->_downloadsha256sums[$id] = $sha256;
     }
@@ -84,6 +86,13 @@
       return $this->_downloads[$id];
     }
 
+    /**
+     * get a download architecture from the release
+     */
+    function getDownloadArch($id) {
+      return $this->_downloadarch[$id];
+    }
+
     /**
      * get a download size (in bytes) from the release
      */
@@ -187,4 +196,4 @@
       }
     }
   }
-?>
+?>