diff options
| author | Romain d'Alverny <rda@mageia.org> | 2011-11-25 17:14:45 +0000 |
|---|---|---|
| committer | Romain d'Alverny <rda@mageia.org> | 2011-11-25 17:14:45 +0000 |
| commit | 776113699f9d7161555100e0820e19a705750e95 (patch) | |
| tree | 62a009d698e8814810c529b5298a8a0cb5417046 | |
| parent | 9db61bc3e4e5938afba711d42d0cf448bf503e83 (diff) | |
| download | www-776113699f9d7161555100e0820e19a705750e95.tar www-776113699f9d7161555100e0820e19a705750e95.tar.gz www-776113699f9d7161555100e0820e19a705750e95.tar.bz2 www-776113699f9d7161555100e0820e19a705750e95.tar.xz www-776113699f9d7161555100e0820e19a705750e95.zip | |
add torrent links
| -rw-r--r-- | en/1/locales.php | 2 | ||||
| -rw-r--r-- | en/2/index.php | 34 | ||||
| -rw-r--r-- | en/downloads/get/index.php | 10 |
3 files changed, 34 insertions, 12 deletions
diff --git a/en/1/locales.php b/en/1/locales.php index 533801c1e..0806924c4 100644 --- a/en/1/locales.php +++ b/en/1/locales.php @@ -24,7 +24,7 @@ $_t = array( for a regular user, a developer, or a business.', 'encourage_you' => 'And we encourage you to <a href="/en/contribute/">be part of it</a>, on your own time or through your professional activity.', - '9_months' => '9 months from <a href="/en/about/2010-sept-announcement.html">inception</a> we\'ve reached:', + '9_months' => '9 months from <a href="/en/about/2010-sept-announcement.html">inception</a> we have reached:', 'people' => '<a href="/en/contribute/">100+ contributors</a> in <a href="https://wiki.mageia.org/en/Contributing">10+ teams</a>. <a href="/en/thank-you/">180+ generous donors</a> of <a href="/en/donate/">11.700+ EUR</a> diff --git a/en/2/index.php b/en/2/index.php index 642fa7f6f..8794f41cd 100644 --- a/en/2/index.php +++ b/en/2/index.php @@ -49,8 +49,14 @@ require '../downloads/lib.php'; <tbody> <tr> <th>Europe 1</th> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe1-Americas-i586-CD.iso">32bit</a>, <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso">64bit</a></td> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe1-Americas-i586-CD.iso">32bit</a>, <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso">64bit</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe1-Americas-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe1-Americas-i586-CD.iso&torrent=1">torrent</a><br> + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso">64bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso&torrent=1">torrent</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe1-Americas-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe1-Americas-i586-CD.iso&torrent=1">torrent</a><br> + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso">64bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -59,8 +65,10 @@ require '../downloads/lib.php'; </tr> <tr> <th>Europe 2</th> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe2-i586-CD.iso">32bit</a></td> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe2-i586-CD.iso">32bit</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe2-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Europe2-i586-CD.iso&torrent=1">torrent</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe2-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Europe2-i586-CD.iso&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -69,8 +77,10 @@ require '../downloads/lib.php'; </tr> <tr> <th>Africa, India</th> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Africa-India-i586-CD.iso">32bit</a></td> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Africa-India-i586-CD.iso">32bit</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Africa-India-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Africa-India-i586-CD.iso&torrent=1">torrent</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Africa-India-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Africa-India-i586-CD.iso&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -78,8 +88,10 @@ require '../downloads/lib.php'; </tr> <tr> <th>Asia</th> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Asia-Noindia-i586-CD.iso">32bit</a></td> - <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Asia-Noindia-i586-CD.iso">32bit</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Asia-Noindia-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-GNOME-Asia-Noindia-i586-CD.iso&torrent=1">torrent</a></td> + <td><a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Asia-Noindia-i586-CD.iso">32bit</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-LiveCD-KDE4-Asia-Noindia-i586-CD.iso&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -93,8 +105,10 @@ require '../downloads/lib.php'; <div class="yui-u"><div class="para"> <h2>Full, Free Software exclusive DVDs</h2> <ul> - <li><a href="../downloads/get/?q=Mageia-2-alpha1-i586-DVD.iso">Mageia 2 alpha1 32bit DVD</a></li> - <li><a href="../downloads/get/?q=Mageia-2-alpha1-x86_64-DVD.iso">Mageia 2 alpha1 64bit DVD</a></li> + <li><a href="../downloads/get/?q=Mageia-2-alpha1-i586-DVD.iso">Mageia 2 alpha1 32bit DVD</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-i586-DVD.iso&torrent=1">torrent</a></li> + <li><a href="../downloads/get/?q=Mageia-2-alpha1-x86_64-DVD.iso">Mageia 2 alpha1 64bit DVD</a>, + <a href="../downloads/get/?q=Mageia-2-alpha1-x86_64-DVD.iso&torrent=1">torrent</a></li> </ul> <p class="dlinfo warn">Note that these DVD ISOs are made of Free Software exclusively. As a consequence, proprietary Wi-Fi and video drivers are not included. diff --git a/en/downloads/get/index.php b/en/downloads/get/index.php index 078b34ff2..50341c95d 100644 --- a/en/downloads/get/index.php +++ b/en/downloads/get/index.php @@ -53,7 +53,15 @@ try { $one_mirror = $all_mirrors[0]; $alt_mirrors = $all_mirrors[1]; - $path = $product['path'] . '/' . $product['file']; + if ($torrent === true + && isset($product['torrent']) + && strlen($product['torrent']) > 0) { + + $path = $product['torrent']; + } else { + $path = $product['path'] . '/' . $product['file']; + } + $download = $one_mirror['mirror_url'] . '/' . $path; $js_redirect = sprintf('<script>(function(){setTimeout("document.location=\'%s\';", 3000);})();</script>', |