Fix i18n, simplifly php, remove hard reference to release in string

2 files changed, 28 insertions, 26 deletions

diff --git a/en/8/download_index.php b/en/8/download_index.php
index 3d4fe6baa..6880b0f1e 100644
--- a/en/8/download_index.php
+++ b/en/8/download_index.php
@@ -93,6 +93,7 @@ input[type="radio"], input[type="submit"], .popover-content  {
     <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
         <?php include '../8/nav.php'; ?>
 <div class="bg-warning text-white p-3 container">WIP</div>
+
     <div id="doc4" class="yui-t7" style="margin-bottom: 0px;">
         <div id="bd" role="main">
             <div class="yui-ge bb1 row">
@@ -127,10 +128,10 @@ input[type="radio"], input[type="submit"], .popover-content  {
 <?php
     echo '<p>';
     _g('ISO image files have been updated to support new hardware.', null, ' ');
-//    _g('They are called Mageia 8.1 release to distinguish them from the original Mageia 8 release.', null, ' ');
-//    _g("Use these if the original Mageia 8 iso images are unable to boot on your hardware, or if you would like more up-to-date software while running in live mode.", null, ' ');
+//    _g('They are called Mageia %s release to distinguish them from the original Mageia %s release.', array('8.1','8'), ' ');
+//    _g('Use these if the original Mageia %s iso images are unable to boot on your hardware, or if you would like more up-to-date software while running in live mode.', '8', ' ');
 //    _g('Please take a look in the <a href="%s">documentation</a> for the appropriate media.', array('../doc/'), null, ' ');
-//_g("There's no need to reinstall if you have Mageia 7 installed and already have the latest updates installed.");
+//   _g('There\'s no need to reinstall if you have Mageia %s installed and already have the latest updates installed.', '8');
     echo '</p>';
 ?>
 </div>
@@ -209,27 +210,27 @@ input[type="radio"], input[type="submit"], .popover-content  {
     <?php _g('Desktop',null,'h2');?>
 
     <div id="gnomeEx" class="popover-content">
-        <?php _g('GNOME Desktop',null,'h3');?>
+        <?php _g('%s Desktop', _r('GNOME'),'h3');?>
         <?php //get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
     </div>
     <div id="kdeEx" class="popover-content">
-        <?php _g('Plasma Desktop',null,'h3');?>
+        <?php _g('%s Desktop', _r('Plasma'),'h3');?>
         <?php //get_image('PLASMA', '/g/5/kde.png', 'width: 100%');?>
     </div>
     <div id="xfceEx" class="popover-content">
-        <?php _g('Xfce Desktop',null,'h3');?>
+        <?php _g('%s Desktop', _r('Xfce'),'h3');?>
         <?php //get_image('PLASMA', '/g/5/kde.png', 'width: 100%');?>
     </div>    
 
     <div class="d-sm-flex justify-content-center">
         <input type="radio" id="kde" value="Plasma" name="desktop" />
-        <label for="kde" class="btn btn-outline-primary"><?php _g('Plasma Desktop')?>
+        <label for="kde" class="btn btn-outline-primary"><?php _g('%s Desktop', _r('Plasma'))?>
         <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="kde">?</a></label>
         <input type="radio" id="gnome" value="GNOME" name="desktop" />
-        <label for="gnome" class="btn btn-outline-primary"><?php _g('GNOME Desktop')?>
+        <label for="gnome" class="btn btn-outline-primary"><?php _g('%s Desktop', _r('GNOME'))?>
         <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="gnome">?</a></label>
         <input type="radio" id="xfce" value="Xfce" name="desktop" />
-        <label for="xfce" class="btn btn-outline-primary"><?php _g('Xfce Desktop')?>
+        <label for="xfce" class="btn btn-outline-primary"><?php _g('%s Desktop', _r('Xfce'))?>
         <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="xfce">?</a></label>
     </div>
 </div><?php }/*live*/?>
@@ -417,7 +418,7 @@ $('img.lazy').each(function(){
         file = $('#live').is(':checked') ? getname + format + '-' + desktop + '-' + arch + '.iso' : $('#classical').is(':checked') ? getname + arch + '.iso' : getname + format + nat + arch + '.iso';
 <?php } ?>
         file = (this.id == 'torrentlink') ? file + '&torrent=1' :  file ;
-        $("a.btn").attr('href','../downloads/get/?q=' + file+'&d=1');
+        $("a.btn").attr('href','../downloads/get/?q=' + file);
     });
 </script>
 </body>
diff --git a/en/8/index.php b/en/8/index.php
index e0ad3cade..963f41f62 100644
--- a/en/8/index.php
+++ b/en/8/index.php
@@ -3,6 +3,7 @@ define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../langs.php';
 $rtl = is_locale_rtl($locale);
+$version = '8';
 
 $dictionary = read_translation_file($locale, array('8', 'common_footer'));
 ?>
@@ -10,8 +11,8 @@ $dictionary = read_translation_file($locale, array('8', 'common_footer'));
 <html <?php echo $rtl ? 'dir="rtl"' : 'dir="ltr"'?> lang="<?php echo $locale; ?>">
 <head>
     <meta charset="utf-8">
-    <title><?php _g('Mageia 8')?></title>
-    <meta name="description" content="<?php _g('Mageia 8 is the new, solid, stable Linux distribution from the Mageia project.')?>">
+    <title><?php _g('Mageia %s', $version)?></title>
+    <meta name="description" content="<?php _g('Mageia %s is the new, solid, stable Linux distribution from the Mageia project.', $version)?>">
     <?php echo common_header(); ?>
     <?php include '../../analytics.php'; ?>
     <style>
@@ -34,7 +35,7 @@ $dictionary = read_translation_file($locale, array('8', 'common_footer'));
 <body <?php echo $rtl ? 'style="text-align: right;"' : ''?> class="downloads">
     <?php echo $hsnav; ?>
 
-    <h1 id="mgnavt"><a href="../8/">Mageia 8</a></h1>
+    <h1 id="mgnavt"><a href="../8/"><?php _g('Mageia %s', $version);?></a></h1>
     <?php include './nav.php'; ?>
 <div class="bg-warning text-white p-3 container">WIP</div>
 <div class="container mga-slider">
@@ -62,17 +63,17 @@ $dictionary = read_translation_file($locale, array('8', 'common_footer'));
             echo $div;
         }
         //carousel('/g/path/to.png', 'alt text', 'TitleCaption', 'TextCaption', active);
-        carousel('/g/8/slide/live-plasma-1.png', 'live-plasma-1', _r('Welcome on Mageia'), _r('Try without installing.') . ' '.  _r('Here is the Plasma Desktop'), true );
+        carousel('/g/8/slide/live-plasma-1.png', 'live-plasma-1', _r('Welcome on Mageia'), _r('Try without installing.', ' ') . sprintf('Here is the %s Desktop', _r('Plasma')), true );
         carousel('/g/8/slide/live-plasma-2.png', 'live-plasma-2', _r('Daily use'), _r('Access all your files') );
         carousel('/g/8/slide/live-plasma-3.png', 'live-plasma-3', _r('Daily use'), _r('Watch all your media') );
-        carousel('/g/8/slide/live-plasma-4.png', 'live-plasma-4', _r('Install'), _r('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media') . ' <a href="../doc/">'. _r('Doc'). '</a>');
-        carousel('/g/8/slide/live-gnome-1.png', 'live-gnome-1', _r('A choice of desktops'), _r('Here is the GNOME Desktop') );
+        carousel('/g/8/slide/live-plasma-4.png', 'live-plasma-4', _r('Install'), _r('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.') . sprintf('<a href="../doc/">%s</a>', _r('Doc')) );
+        carousel('/g/8/slide/live-gnome-1.png', 'live-gnome-1', _r('A choice of desktops'), sprintf('Here is the %s Desktop', _r('GNOME')) );
         carousel('/g/8/slide/live-gnome-2.png', 'live-gnome-2', '', '');
         carousel('/g/8/slide/live-gnome-3.png', 'live-gnome-3', _r('Install'), '' );
-        carousel('/g/8/slide/live-xfce-1.png', 'live-xfce-1', _r('A choice of desktops'), _r('Here is the Xfce Desktop') );
+        carousel('/g/8/slide/live-xfce-1.png', 'live-xfce-1', _r('A choice of desktops'), sprintf('Here is the %s Desktop', _r('Xfce')) );
         carousel('/g/8/slide/live-xfce-2.png', 'live-xfce-2', _r('Install'), _r('You can install all <a href="https://madb.mageia.org/">apps available</a> even in live mode') );
-        carousel('/g/8/slide/mcc-1.png', 'mcc-1', _r('Tools'), _r('Mageia Center Control') . ': '. _r('Install applications') );
-        carousel('/g/8/slide/mcc-2.png', 'mcc-2', _r('Tools'), _r('Mageia Center Control') . ': '. _r('Configure your hardware') );
+        carousel('/g/8/slide/mcc-1.png', 'mcc-1', _r('Tools'), _r('Mageia Control Center', ': ') . _r('Install applications') );
+        carousel('/g/8/slide/mcc-2.png', 'mcc-2', _r('Tools'), _r('Mageia Control Center', ': '). _r('Configure your hardware') );
         carousel('/g/8/slide/classical-1.png', 'classical-1', _r('Install') , _r('Classic Installation') );
         ?>
         <a class="carousel-control-prev" href="#carouselMga" role="button" data-slide="prev">
@@ -91,20 +92,20 @@ $dictionary = read_translation_file($locale, array('8', 'common_footer'));
     <div class="row">
     <div class="col">
     <div class="para">
-        <?php _g('About Mageia 8', null, 'h2'); ?>
+        <?php _g('About Mageia %s', $version, 'h2'); ?>
 
         <?php
-        _g('Mageia 8 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'), 'p');?>
+        _g('Mageia %s is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', $version, array('../community'), 'p');?>
 
-        <p><a href="./download_index.php" class="btn btn-primary"><?php _g('Download it right away!');?></a></p>
+        <p><a href="../downloads" class="btn btn-primary"><?php _g('Download it right away!');?></a></p>
 
-<?php       _g('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 8 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or Plasma.', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')), 'p');
+<?php       _g('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia %s directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or Plasma.', $version, array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')), 'p');
         _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');
         _g('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p');
-        _g('Mageia 8 includes several desktop managers including Plasma, GNOME, Xfce, Mate, LXQt and Cinnamon.', null, 'p');
+        _g('Mageia %s includes several desktop managers including Plasma, GNOME, Xfce, Mate, LXQt and Cinnamon.', $version, 'p');
         _g('There are lots of applications in the official repositories. You can have a look at the <a href="%s">Mageia Application Database</a> to get a complete list of packages inside Mageia.', array('//madb.mageia.org'), 'p');
         _g('What\'s new?', null, 'h2');
-        _g('There\'s plenty of new goodness in Mageia 8, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array($releasenotes), 'p', 'class="warn"');
+        _g('There\'s plenty of new goodness in Mageia %s, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.', array($version, $releasenotes), 'p', 'class="warn"');
         ?>
     </div>
     </div>
@@ -114,7 +115,7 @@ $dictionary = read_translation_file($locale, array('8', 'common_footer'));
        <?php
          _g('Mageia in context', null, 'h2');
 
-           _g('Mageia 8 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is  governed by a body of recognized and elected contributors.',array('../about/'), 'p');
+           _g('Mageia %s is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is  governed by a body of recognized and elected contributors.', $version, array('../about/'), 'p');
 
            _g('Our work adds to the excellent work of the wider Linux and Free Software community. We aim to blend all the excellent work done by the community, adding the special Mageia ingredients, to bring you the best, most stable, reliable and enjoyable experience we can make for regular users, developers and businesses.', null, 'p');