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

1 files changed, 11 insertions, 10 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>