2 files changed, 11 insertions, 9 deletions
diff --git a/en/7/download_index.php b/en/7/download_index.php
index 9dea8c793..7e77bd5ce 100644
--- a/en/7/download_index.php
+++ b/en/7/download_index.php
@@ -14,6 +14,7 @@ define('ALIGNMENT', 'Center');
 
 require '../../langs.php';
 $dictionary = read_translation_file($locale, array('7', 'common_footer'));
+$rtl = is_locale_rtl($locale);
 
 function get_mageia($name, $version, $release)
 {
@@ -21,7 +22,7 @@ function get_mageia($name, $version, $release)
   return implode('-', array($name, $re));
 }
 
-function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext)
+function get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, $ext)
 {
   $va   = empty($variant) ? $arch : $variant . '-' . $arch;
   $re   = empty($release) ? $va : $release . '-' . $va;
@@ -29,7 +30,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null,
   return implode('-', array($name, $version, $re)) . $ext;
 }
 
-function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true)
+function dl_link($name, $version, $release, $variant, $arch, $medium, $torrent = false, $torrentavailable = true)
 {
   switch ($arch) {
   case "i586":
@@ -58,7 +59,7 @@ function get_image($ttl, $src, $sty){
 
 ?>
 <!DOCTYPE html>
-<html dir="ltr" lang="<?php echo $locale; ?>">
+<html <?php echo $rtl ? 'dir="rtl"' : 'dir="ltr"'?> lang="<?php echo $locale; ?>">
 <head>
     <meta charset="utf-8">
     <title><?php echo sprintf(_g('Download').' '. '%s %s %s', $name, $version, $release)?></title>
@@ -86,7 +87,7 @@ input[type="radio"], input[type="submit"], .popover-content  {
 }
 </style>
 </head>
-<body class="release downloads">
+<body class="release downloads" <?php echo $rtl ? 'style="text-align: right;"' : ''?>>
     <?php echo $hsnav; ?>
 
     <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
@@ -97,13 +98,13 @@ input[type="radio"], input[type="submit"], .popover-content  {
             <div class="yui-u first col-md-8">
 
 <noscript>
-<div class="para alert alert-info"><?php _g('It looks like you have JavaScript disable. Please <a href="%s">enable</a> it to have better render. At the <a href="%s">end</a> of this page there will be download link for you. But what is written between is important.',array('http://www.enable-javascript.com/','#NoscriptDownload'),'p'); ?></div>
+<div class="para alert alert-info"><?php _g('It looks like you have JavaScript disabled. Please <a href="%s">enable</a> it to have better rendering. At the <a href="%s">end</a> of this page there will be download link for you, but what is written between is important.',array('http://www.enable-javascript.com/','#NoscriptDownload'),'p'); ?></div>
 <style>.pop{display: none;} .popover-content{display:block ;}</style>
 </noscript>
 
 <div class="para">
     <?php // _g('But please remember that it will soon <a href="%s">reach EOL</a>.', array('../support/'), 'h2 class="warn"');
-    // _g('But please remember that it already <a href="%s">reached EOL</a>.', array(_not_yet('https://blog.mageia.org/en/2019/.../')), 'h2 class="warn"'); ?>
+    _g('But please remember that it already <a href="%s">reached EOL</a>.', array(_r('https://blog.mageia.org/en/2021/06/08/mageia-7-will-reach-end-of-support-on-30th-of-june-the-king-is-dead-long-live-the-king/')), 'h2 class="warn"'); ?>
     <p>
     <?php _g('Mageia is provided as ISO image files that have to be written to blank <a href="%s">CD or DVD discs</a>.', array(_r('https://wiki.mageia.org/en/Writing_CD_and_DVD_images')), ' '); ?>
     <br>
@@ -112,7 +113,7 @@ input[type="radio"], input[type="submit"], .popover-content  {
     _g('To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one of several tools:', array('href="#" data-tip="iso2usb" class="pop"'),'p');
     echo '<ul><li>';
     _g('For Linux, IsoDumper, available inside repo. Or any tools based on %sdd%s.', array('<span class="italic" >', '</span>'), ' ');
-    _g('Unetbootin is not supported.', null, 'span class="warn"'); ?>
+    _g('UNetbootin is not supported.', null, 'span class="warn"'); ?>
     </li>
     <?php _g('For Windows please have a look on our <a href="%s">wiki</a> for your options.', array(_r('https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools')), 'li'); ?>
     </ul>
@@ -286,7 +287,7 @@ input[type="radio"], input[type="submit"], .popover-content  {
 <?php if($torrentavailable){ ?>
     <?php _g('BitTorrent',null,'h3');
     _g('We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files.',array(_r('http://en.wikipedia.org/wiki/BitTorrent')),'p');?>
-<?php } else { echo _g('BitTorrent link are not yet available.',null, 'p style="margin-top:1.5em;" class="warn"'); } ?> 
+<?php } else { echo _g('BitTorrent links are not yet available.',null, 'p style="margin-top:1.5em;" class="warn"'); } ?>
     </div>
 
     <div class="d-sm-flex justify-content-center">
@@ -393,6 +394,7 @@ $('img.lazy').each(function(){
     $('input[name=desktop]').click(function () {
         $('#arch')[ $('#gnome,#kde,#xfce').is(':checked') ? 'slideDown' : 'slideUp']();
         $('label[for="32b"]')[$('#gnome,#kde').is(':checked') ? 'hide' : 'show']()
+        $('#dllink')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
         lazyload();
     });
 
diff --git a/en/7/nav.php b/en/7/nav.php
index bac0e9366..9a326469f 100644
--- a/en/7/nav.php
+++ b/en/7/nav.php
@@ -20,7 +20,7 @@ $sru = trim($_SERVER['REQUEST_URI']);
 
 $pnav = array();
 foreach ($nav as $k => $v) {
-    $pnav[] = sprintf('<li class="flex-sm-fill text-sm-center nav-item"><a href="%s"%s>%s</a></li>',
+    $pnav[] = sprintf('<li class="text-sm-center nav-item"><a href="%s"%s>%s</a></li>',
         $k,
         $k == $sru ? ' class="nav-link active"' : ' class="nav-link"',
         $v);