[Xfce4-commits] <www:nick/gettext> Some updates.

[Nick Schermer]

Updating branch refs/heads/nick/gettext
         to 74218cf55f6cb2132d2a021057b0b9bf3da749d2 (commit)
       from df3a64da47910e7fa98ab3b1309b6db90deacd07 (commit)

commit 74218cf55f6cb2132d2a021057b0b9bf3da749d2
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jan 10 19:12:42 2011 +0100

    Some updates.

 pages/download/index.php    |   49 +++++++++++++++++++++++++++---------------
 pages/getinvolved/index.php |   11 ++++-----
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/pages/download/index.php b/pages/download/index.php
index 88dae38..b2aec3f 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -12,18 +12,36 @@ if($preview_visible) {
         $toc['anchors'] += array ('unstable' => R_('Preview release'));
 }
 
-$servers = array (
-  array ('mocha.xfce.org', R_('Europe/Belgium'), 'http://mocha.xfce.org/archive/%s'),
-  array ('p0llux.be', R_('Europe/France'), 'http://www.p0llux.be/xfce/archive/%s'),
-  array ('tx-us.xfce.org', R_('United States/Texas'), 'http://www.tx-us.xfce.org/archive/%s'),
-  array ('ca-us.xfce.org', R_('United States/California'), 'http://www.ca-us.xfce.org/archive/%s')
+$mirrors = array (
+  'archive.be.xfce.org' => R_('Europe/Belgium'),
+  'archive.be2.xfce.org' => R_('Europe/Belgium'),
+  'archive.se.xfce.org' => R_('Europe/Sweden'),
+  //'archive.ca-us.xfce.org' => R_('United States/California'),
+  //'archive.in-us.xfce.org' => R_('United States/Indiana'),
+  //'archive.tx-us.xfce.org' => R_('United States/Texas'),
 );
 
-function print_servers($path)
+function print_mirrors($path)
 {
-  global $servers;
-  foreach ($servers as $s)
-    echo '  <li><a href="'.sprintf($s[2], $path).'">'.$s[0].' ('.$s[1].')</a></li>'."\n";
+  global $mirrors;
+
+  echo '  <ul>'."\n";
+
+  if (isset($_GET['mirror']) && $_GET['mirror'] == $path)
+  {
+    foreach ($mirrors as $m => $l)
+    {
+      $url = 'http://'.$m.'/'. $path;
+      echo '    <li><a href="'.$url.'">'.$m.'</a> ('.$l.')</li>'."\n";
+    }
+  }
+  else
+  {
+    echo '    <li><a href="http://archive.xfce.org/'.$path.'">archive.xfce.org</a> '.
+         '<a href=/download/?mirror='.$path.'>(', R_('mirror list') .'</a>)'."</li>\n";
+  }
+
+  echo '  </ul>'."\n";
 }
 
 ?>
@@ -40,18 +58,14 @@ function print_servers($path)
   <?php printf (R_('Xfce %s is the most recent version of the Xfce desktop environment. You can find the changes in this release <a href="/download/changelogs/%s">here</a>.'), $stable_version, $stable_version) ?>
 </p>
 
-<ul>
-  <?php print_servers ('xfce/'.$stable_version) ?>
-</ul>
+<?php print_mirrors ('xfce/'.$stable_version) ?>
 
 <h2 id="individual"><?php E_('Individual releases') ?></h2>
 <p>
   <?php E_('Each package in Xfce can make idividual stable or development releases, including the core packages (as discribed in the <a href="/about/releasemodel">release model</a>). You can follow the announcements of the releases on the <a href="/community/lists">Xfce users mailing list</a>, watch the <a href="http://releases.xfce.org/feeds/project/">release feeds</a> or follow the Xfce <a href="http://identi.ca/xfce">identi.ca channel</a>.') ?>
 </p>
 
-<ul>
-  <?php print_servers ('src') ?>
-</ul>
+<?php print_mirrors ('src') ?>
 
 <?php if ($preview_visible) { ?>
 <h2 id="unstable"><?php printf (R_('Preview release %s'), $preview_version) ?></h2>
@@ -59,7 +73,6 @@ function print_servers($path)
   <?php printf (R_('Xfce %s is the latest development release of the Xfce desktop environment. This release should not be used in a production environments. If you are uncertain about downloading this release, you should probably use the <a href="#stable">stable release</a> above. You can find the changes in this release <a href="/download/changelogs/%s">here</a>.'), $preview_version, $preview_version) ?>
 </p>
 
-<ul>
-  <?php print_servers ('xfce/'.$preview_version) ?>
-</ul>
+<?php print_mirrors ('xfce/'.$preview_version) ?>
+
 <?php } ?>
diff --git a/pages/getinvolved/index.php b/pages/getinvolved/index.php
index 6f0fb4a..b292751 100644
--- a/pages/getinvolved/index.php
+++ b/pages/getinvolved/index.php
@@ -24,17 +24,16 @@
   <?php E_('By becoming a developer, you can make a big difference while enjoying a challenging and fun experience. You\'ll learn to be a better coder, you will get to implement new features and defeat daunting bugs, creating a stunning product, all the while collaborating with people from all around the world.') ?>
 </p>
 
-<h2><a href="/getinvolved/promotion"><?php E_('Promotion') ?></a></h2>
+<h2><?php E_('Promotion') ?></h2>
 <p>
-
+  <?php E_('If you own a blog or website you can greatly help by spreading the word and encouraging new users to give Xfce a try. If you have a Identi.ca or Twitter account you can also help by reposting any <a href="http://identi.ca/xfce">announcements</a> we make to help us reach a larger audience.') ?>
 </p>
 
-<h2><a href="/getinvolved/testing"><?php E_('Testing') ?></a></h2>
+<h2><?php E_('Bug Reporting and testing') ?></h2>
 <p>
-
+  <?php E_('One of the most useful tasks that we rely on the community for is testing and reporting of bugs. Since Xfce runs on various platform and in a lot of different setups, testing all changes in every possible situation is an impossible task. As such we kindly ask users to assist in testing, and reporting all bugs they may find, using our <a href="http://bugzilla.xfce.org" class="external">bug tracker</a>.') ?>
 </p>
 
-<h2><a href="/getinvolved/bugreporting"><?php E_('Bug Reporting') ?></a></h2>
 <p>
-
+  <?php E_('Once a bug has been found, the cause of the bug needs to be tracked down, and then (obviously) fixed. If you want to get involved in the actual development process of Xfce a great way to start is by solving bugs and then submitting a patch file.') ?>
 </p>