aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2011-07-18 21:47:51 +0000
committerRomain d'Alverny <rda@mageia.org>2011-07-18 21:47:51 +0000
commitc8cfd9d7d35ccd431096d992e86a3ad2ec07b248 (patch)
tree8763b48014136f3c01258426a998ec09eeb984e8
parent32c0fbfde89524f945d57e4fb86c60e6f7fd3952 (diff)
downloadwww-c8cfd9d7d35ccd431096d992e86a3ad2ec07b248.tar
www-c8cfd9d7d35ccd431096d992e86a3ad2ec07b248.tar.gz
www-c8cfd9d7d35ccd431096d992e86a3ad2ec07b248.tar.bz2
www-c8cfd9d7d35ccd431096d992e86a3ad2ec07b248.tar.xz
www-c8cfd9d7d35ccd431096d992e86a3ad2ec07b248.zip
reorganize downloads code
Diffstat
-rw-r--r--en/1/notes/locales.php8
-rw-r--r--en/downloads/dl.php15
-rw-r--r--en/downloads/downloads.ini172
-rw-r--r--en/downloads/index.php13
-rw-r--r--en/downloads/lib.php (renamed from downloads.php)11
-rw-r--r--en/downloads/locales.php (renamed from downloads_locales.php)0
6 files changed, 197 insertions, 22 deletions
diff --git a/en/1/notes/locales.php b/en/1/notes/locales.php
index a66ad985f..1bc8705a0 100644
--- a/en/1/notes/locales.php
+++ b/en/1/notes/locales.php
@@ -2,10 +2,10 @@
$_t = array(
'en' => array(
- 'page_title' => 'Mageia 1 Release Notes',
- 'page_desc' => 'Notes of the Mageia 1 release',
- 'page_kw' => 'mageia, release notes, Mga1',
- 'page_h1' => 'Release Notes',
+ 'page_title' => 'Mageia 1 Release Notes',
+ 'page_desc' => 'Notes of the Mageia 1 release',
+ 'page_kw' => 'mageia, release notes, Mga1',
+ 'page_h1' => 'Release Notes',
'major_features' => 'Major features',
'major_features_array' => array('Packagement management',
'System configuration',
diff --git a/en/downloads/dl.php b/en/downloads/dl.php
index 23c24596b..9827d46db 100644
--- a/en/downloads/dl.php
+++ b/en/downloads/dl.php
@@ -6,8 +6,13 @@ $product = isset($_GET['product']) ? trim(strtolower($_GET['product'])) : null;
$torrent = isset($_GET['torrent']) ? true : false;
$mirror = isset($_GET['mirror']) ? trim(strtolower($_GET['mirror'])) : null;
-include '../../downloads.php';
-include '../../lib/Downloads.php';
+define('HLANG', true);
+require '../../langs.php';
+require 'locales.php';
+
+$_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
+
+require 'lib.php';
session_start();
@@ -26,11 +31,12 @@ if (!$found) {
header('Location: /downloads/');
die;
}
+include '../../lib/Downloads.php';
$g_mirrors = Downloads::get_all_mirrors();
$product_iso = $product . '.iso';
-$wsd = new Downloads('en', null);
+$wsd = new Downloads($locale, null);
$a = $wsd->prepare_download(null, true);
$product_dl_link = null;
@@ -101,8 +107,7 @@ $dl2_mirror_alt = sprintf($_t['dl_mirror_loc'],
<?php endif; ?>
</head>
<body>
- <?php include '../../langs.php'; ?>
-
+ <?php echo $hsnav; ?>
<div id="doc" class="yui-t7">
<div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">&nbsp;</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
<div id="bd" role="main">
diff --git a/en/downloads/downloads.ini b/en/downloads/downloads.ini
new file mode 100644
index 000000000..ab31bc046
--- /dev/null
+++ b/en/downloads/downloads.ini
@@ -0,0 +1,172 @@
+; Mageia downloads definition file
+
+[_global]
+name = Mageia 1
+prefix = mageia-1
+type = iso
+errata = "http://mageia.org/wiki/doku.php?id=mageia1:errata"
+notes = "http://mageia.org/1/
+blog = "http://blog.mageia.org/en/
+
+[_popularity]
+;extracted/normalized from www download logs; need time to make this automatic + post -rda
+dvd-i586 = 5
+dvd-x86_64 = 3
+cd-dualarch = 1
+live-kde-europe1-cd-i586 = 4
+live-gnome-europe1-cd-i586 = 3
+live-kde-europe2-cd-i586 = 3
+live-gnome-europe2-cd-i586 = 2
+live-kde-asia-cd-i586 = 1
+live-kde-africa-cd-i586 = 1
+live-gnome-asia-cd-i586 = 1
+live-gnome-africa-cd-i586 = 1
+netboot-i586 = 1
+netboot-x86_64 = 1
+
+[dvd-i586]
+flavour = DVD
+name = 32-bit DVD
+size = 4 GB
+lang = All supported
+md5 = 535c53fabfaea25ad6ad49edbbf6ce0a
+sha1 = 1146008d408d5929ed07580070e453f6b4e64277
+path = iso/1/mageia-dvd-1-i586.iso
+torrent = iso/1/torrents/mageia-dvd-1-i586.torrent
+
+[dvd-x86_64]
+flavour = DVD
+name = 64-bit DVD
+size = 4 GB
+lang = All supported
+md5 = 7e65859068810b5c2da7593e4254293a
+sha1 = e9679d433afbea721e33f830691c4044055f13ae
+path = iso/1/mageia-dvd-1-x86_64.iso
+torrent = iso/1/torrents/mageia-dvd-1-x86_64.torrent
+
+; Dual arch
+[cd-dualarch]
+flavour = CD
+name = Dual Arch CD
+size = 700 MB
+lang = Limited
+md5 = 7574f31cb8429614026a61c50578d863
+sha1 = 427e25a4c8aad56c0a19fae0bbbe085f1fc641ba
+path = iso/1/mageia-dual-1.iso
+torrent = iso/1/torrents/mageia-dual-1.torrent
+
+; KDE LiveCDs (32-bit)
+[live-kde-europe1-cd-i586]
+flavour = LiveCD 32-bit
+name = KDE
+size = 700 MB
+lang = Europa set 1
+langs = de|en|es|fr|it|pl|pt|ru
+md5 = 4977f5a974dec5b937a891e29cce5fdb
+sha1 = ca68b6c642e91ad21026f872d097439d32457d30
+path = iso/1/mageia-livecd-1-KDE4-europe1-americas-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-europe1-americas-cdrom-i586.torrent
+
+[live-kde-europe2-cd-i586]
+flavour = LiveCD 32-bit
+name = KDE
+size = 700 MB
+lang = Europa set 2
+langs =
+md5 = 90768c05344ab250ae84f985e1b849c1
+sha1 = 715fca8f8411fa6d36b16c192a6566dd29ef4915
+path = iso/1/mageia-livecd-1-KDE4-europe2-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-europe2-cdrom-i586.torrent
+
+[live-kde-asia-cd-i586]
+flavour = LiveCD 32-bit
+name = KDE
+size = 700 MB
+lang = Asia set
+langs =
+md5 = 1b904aa607a464c7c712209acd109710
+sha1 = a53fa906c143e591082442d076c2b3b202fe8a47
+path = iso/1/mageia-livecd-1-KDE4-asia-noindia-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-asia-noindia-cdrom-i586.torrent
+
+[live-kde-africa-cd-i586]
+flavour = LiveCD 32-bit
+name = KDE
+size = 700 MB
+lang = Africa/India set
+langs =
+md5 = f7fc7ea64b38b04874ad7d3d6d904461
+sha1 = 072eeef7eedc0ca7ad070ed2f45403e7b2a601e6
+path = iso/1/mageia-livecd-1-KDE4-africa-india-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-africa-india-cdrom-i586.torrent
+
+; GNOME LiveCDs (32-bit)
+[live-gnome-europe1-cd-i586]
+flavour = LiveCD 32-bit
+name = GNOME
+size = 700 MB
+lang = Europa set 1
+langs = de|en|es|fr|it|pl|pt|ru
+md5 = be86c06cc4ad27b0ae36f673ddbfc489
+sha1 = fd648c7a21d54c2a52f9ed66cf1093f82acd828c
+path = iso/1/mageia-livecd-1-GNOME-europe1-americas-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-europe1-americas-cdrom-i586.torrent
+
+[live-gnome-europe2-cd-i586]
+flavour = LiveCD 32-bit
+name = GNOME
+size = 700 MB
+lang = Europa set 2
+langs =
+md5 = a8550c9932d7a7430fa4f574895f881e
+sha1 = fc191d30cf822ef5dfffcfbb0d228e442db00530
+path = iso/1/mageia-livecd-1-GNOME-europe2-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-europe2-cdrom-i586.torrent
+
+[live-gnome-asia-cd-i586]
+flavour = LiveCD 32-bit
+name = GNOME
+size = 700 MB
+lang = Asia set
+langs =
+md5 = b415d0d8b7f0384c16ebc18dcaccbbb0
+sha1 = 1cd93b7c34149bf326b22b61afa47bf7144a9921
+path = iso/1/mageia-livecd-1-GNOME-asia-noindia-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-asia-noindia-cdrom-i586.torrent
+
+[live-gnome-africa-cd-i586]
+flavour = LiveCD 32-bit
+name = GNOME
+size = 700 MB
+lang = Africa/India set
+langs =
+md5 = 621f4e965c04e49b8602b4ec670e8466
+sha1 = 753afcd28978ff89dc0a8840f8f33b65bf8dad30
+path = iso/1/mageia-livecd-1-GNOME-africa-india-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-africa-india-cdrom-i586.torrent
+
+; boot.iso
+[netboot-i586]
+flavour = boot.iso CD
+name = boot.iso 32-bit CD
+size = 40 MB
+lang = All supported
+path = distrib/1/i586/install/images/boot.iso
+
+[netboot-x86_64]
+flavour = boot.iso CD
+name = boot.iso 64-bit CD
+size = 40 MB
+lang = All supported
+path = distrib/1/x86_64/install/images/boot.iso
+
+; mgaonline RPM
+[mgaonline]
+type = rpm
+hidden = true
+name = mgaonline
+size = 196 KB
+page_title = mgaonline
+post_link = /migrate/
+post_title = Go back to the migration page
+path = distrib/1/i586/media/core/release/mgaonline-2.77.29-1.mga1.noarch.rpm
diff --git a/en/downloads/index.php b/en/downloads/index.php
index a04ad8428..cbf8a696e 100644
--- a/en/downloads/index.php
+++ b/en/downloads/index.php
@@ -1,7 +1,16 @@
-<?php require '../../downloads.php';
+<?php
+
+define('HLANG', true);
+require '../../langs.php';
+require 'locales.php';
+
+$_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 1</em>');
$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1');
+
+require 'lib.php';
+
?>
<!DOCTYPE html>
<html lang="<?php echo $locale; ?>">
@@ -15,7 +24,7 @@ $_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1');
<?php include '../../analytics.php'; ?>
</head>
<body class="release">
- <?php include '../../langs.php'; ?>
+ <?php echo $hsnav; ?>
<div id="doc" class="yui-t7">
<div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
<div id="bd" role="main">
diff --git a/downloads.php b/en/downloads/lib.php
index aef49b3f5..2918ee773 100644
--- a/downloads.php
+++ b/en/downloads/lib.php
@@ -2,16 +2,6 @@
/**
*/
-$locale = explode('/', $_SERVER['REQUEST_URI']);
-$locale = $locale[1];
-
-include 'downloads_locales.php';
-
-if (!array_key_exists($locale, $_t))
- $locale = 'en';
-
-$_t = array_merge($_t['en'], $_t[$locale]);
-
$prods = parse_ini_file('downloads.ini', true);
$countries = array(
'AU' => 'Australia',
@@ -130,4 +120,3 @@ $dl_table .= <<<T
T;
-
diff --git a/downloads_locales.php b/en/downloads/locales.php
index ebcf6c7ea..ebcf6c7ea 100644
--- a/downloads_locales.php
+++ b/en/downloads/locales.php
generated by cgit v1.2.1 (git 2.21.0) at 2024-05-13 22:30:41 +0000