From 37ca3c02dc1bc3157b649d4d8e5e4f68d06ec47b Mon Sep 17 00:00:00 2001
From: Manuel Hiebel
Date: Fri, 12 Feb 2021 20:14:02 +0100
Subject: Fix i18n, simplifly php, remove hard reference to release in string
---
en/8/download_index.php | 21 +++++++++++----------
en/8/index.php | 33 +++++++++++++++++----------------
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 {
%s %s %s',$name, $version, $release)?>
WIP
+
@@ -127,10 +128,10 @@ input[type="radio"], input[type="submit"], .popover-content {
';
_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
documentation 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 '';
?>
@@ -209,27 +210,27 @@ input[type="radio"], input[type="submit"], .popover-content {
-
+
-
+
-
+
@@ -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';
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);
});
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'));
lang="">