Skip to content

Commit

Permalink
Prepare more links with "?lang" parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
gerundt committed Dec 20, 2021
1 parent ea9ab1b commit e59a94e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions htdocs/docs/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<li><a href="https://manual.winmerge.org/jp/" class="button is-small"><?php __e('Japanese');?></a></li>
</ul>
<?php
$page->printLinkedSubHeading(__('Release Notes'), 'releasenotes.php');
$page->printPara(__('The <a href="%1$s">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href="%2$s">known issues</a> in the current WinMerge release.', 'releasenotes.php', 'releasenotes.php#known-issues'));
$page->printLinkedSubHeading(__('Change Log'), 'changelog.php');
$page->printPara(__('The <a href="%s">change log</a> is a more complete list of changes in the last WinMerge releases.', 'changelog.php'));
$page->printLinkedSubHeading(__('Release Notes'), $translations->prepareLink('releasenotes.php'));
$page->printPara(__('The <a href="%1$s">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href="%2$s">known issues</a> in the current WinMerge release.', $translations->prepareLink('releasenotes.php'), $translations->prepareLink('releasenotes.php#known-issues')));
$page->printLinkedSubHeading(__('Change Log'), $translations->prepareLink('changelog.php'));
$page->printPara(__('The <a href="%s">change log</a> is a more complete list of changes in the last WinMerge releases.', $translations->prepareLink('changelog.php')));
//$page->printLinkedSubHeading(__('Development Wiki'), 'http://wiki.winmerge.org/');
//$page->printPara(__('The <a href="%s">Development Wiki</a> contains much information about the WinMerge development.', 'http://wiki.winmerge.org/'));

Expand Down
2 changes: 1 addition & 1 deletion htdocs/downloads/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
$page->printPara(__('The easiest way to install WinMerge is to download and run the Installer. Read the <a href="%s">online manual</a> for help using it.', 'https://manual.winmerge.org/en/Install.html'));
$page->printSubHeading(__('WinMerge %s', $stablerelease->getVersionNumber()));
$page->printPara(__('The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>.', $stablerelease->getVersionNumber(), $stablerelease->getDate()),
__('For detailed info on what is new, read the <a href="%1$s">change log</a> and the <a href="%2$s">release notes</a>.', '/docs/changelog.php', '/docs/releasenotes.php'));
__('For detailed info on what is new, read the <a href="%1$s">change log</a> and the <a href="%2$s">release notes</a>.', $translations->prepareLink('/docs/changelog.php'), $translations->prepareLink('/docs/releasenotes.php')));
?>
<div class="table-scrollable">
<table class="table is-striped">
Expand Down
8 changes: 4 additions & 4 deletions htdocs/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
$stablerelease = $page->getStableRelease();

$page->printHeading(__('What is WinMerge?'));
$page->printPara(__('WinMerge is an <a href="%s">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.', $translations->prepareLink('/source-code')));
$page->printPara(__('WinMerge is an <a href="%s">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.', $translations->prepareLink('source-code/')));

$page->printSubHeading(__('Screenshot'));
?>
<p><img class="image" src="screenshots/filecmp.png" alt="<?php __e('File Comparison');?>" border="0"></p>
<?php
$page->printPara(__('See the <a href="%s">screenshots page</a> for more screenshots.', $translations->prepareLink('/screenshots')));
$page->printPara(__('See the <a href="%s">screenshots page</a> for more screenshots.', $translations->prepareLink('screenshots/')));

$page->printSubHeading(__('Features'));
$page->printPara(__('WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application.'));
Expand Down Expand Up @@ -73,7 +73,7 @@
</ul>
<?php
$page->printSubHeading(__('WinMerge %s - latest stable version', $stablerelease->getVersionNumber()));
$page->printPara(__('<a href="%1$s">WinMerge %2$s</a> is the latest stable version, and is recommended for most users.', $translations->prepareLink('/downloads'), $stablerelease->getVersionNumber()));
$page->printPara(__('<a href="%1$s">WinMerge %2$s</a> is the latest stable version, and is recommended for most users.', $translations->prepareLink('downloads/'), $stablerelease->getVersionNumber()));

$page->printRssSubHeading(__('Project News'), 'https://sourceforge.net/export/rss2_projnews.php?group_id=13216');
$feed = new SimplePie();
Expand All @@ -88,7 +88,7 @@
print("</ul>\n");

$page->printSubHeading(__('Support'));
$page->printPara(__('If you need support, look at our <a href="%s">support page</a> for more information how you can get it.', $translations->prepareLink('/support')));
$page->printPara(__('If you need support, look at our <a href="%s">support page</a> for more information how you can get it.', $translations->prepareLink('support/')));

$page->printSubHeading(__('Developers'));
$page->printPara(__('WinMerge is an open source project, which means that the program is maintained and developed by volunteers.'));
Expand Down
2 changes: 1 addition & 1 deletion htdocs/source-code/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

$page->printPara(__('WinMerge is <a href="%1$s">Open Source</a> software under the <a href="%2$s">GNU General Public License</a>.', 'https://www.opensource.org/', 'https://www.gnu.org/licenses/gpl-2.0.html'));
$page->printPara(__('This means everybody can download the <a href="%s">source code</a> and improve and modify it.
The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit.', '#clone-or-download'));
The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit.', $translations->prepareLink('#clone-or-download')));

$page->printAnchorSubHeading(__('GNU General Public License'), 'gpl');
?>
Expand Down
2 changes: 1 addition & 1 deletion htdocs/support/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$page->printPara(__('Wish list items on the <a href="%s">issues list</a> will also be considered, but we make absolutely no promises.', 'https://github.com/WinMerge/winmerge/issues'));

$page->printSubHeading(__('Donate'));
$page->printPara(__('Since WinMerge is an <a href="%s">Open Source</a> project, you may use it free of charge.', $translations->prepareLink('/source-code')),
$page->printPara(__('Since WinMerge is an <a href="%s">Open Source</a> project, you may use it free of charge.', $translations->prepareLink('source-code/')),
__('But please consider making a <a href="%s">donation</a> to support the continued development of WinMerge.', 'https://sourceforge.net/project/project_donations.php?group_id=13216'));

$page->printSubHeading(__('Buy WinMerge merchandise'));
Expand Down

0 comments on commit e59a94e

Please sign in to comment.