[Xfce4-commits] <www:nick/gettext> Less complicated version numbers.

[Nick Schermer]

Updating branch refs/heads/nick/gettext
         to 81667826f0a270d0e919b63c9a59b6b2dcc22cfc (commit)
       from c22b2bff51a24a03c4430f4a965557958e3a83f4 (commit)

commit 81667826f0a270d0e919b63c9a59b6b2dcc22cfc
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Nov 23 20:02:22 2010 +0100

    Less complicated version numbers.

 pages/download/index.php |   10 +++++-----
 pages/versions.php       |   23 +++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pages/download/index.php b/pages/download/index.php
index 687e92c..7766f17 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -20,7 +20,7 @@ function print_servers($path)
 
 <h1><?php E_('Download') ?></h1>
 
-<h2 id="stable"><?php printf (R_('Stable release %s'), $full_stable_version) ?></h1>
+<h2 id="stable"><?php printf (R_('Stable release %s'), $stable_version) ?></h1>
 <p>
   <?php E_('Most distributions ship with Xfce. But if you want a newer version or you want to build Xfce from scratch, you can find the packages below. You can also take a look at a list of Xfce-oriented distributions <a href="/download/distros">here</a>.') ?>
 </p>
@@ -30,17 +30,17 @@ function print_servers($path)
 </p>
 
 <ul>
-<?php print_servers ('xfce/'.$full_stable_version) ?>
+<?php print_servers ('xfce/'.$stable_version) ?>
 </ul>
 
-<?php if ($devel_version) { ?>
-<h2 id="unstable"><?php printf (R_('Preview release %s'), $full_devel_version) ?></h2>
+<?php if ($preview_visible) { ?>
+<h2 id="unstable"><?php printf (R_('Preview release %s'), $preview_version) ?></h2>
 <p>
   <?php E_('Below you can find download locations for the latest development/unstable release of Xfce. Note that this software almost certainly contains bugs, many of which might affect your desire to use it in a production environment. You should back up all configuration files before installing and using these releases. If you\'re uncertain about downloading this release, you should probably use the <a href="#stable">stable release</a> above.') ?>
 </p>
 
 <ul>
-<?php print_servers ('xfce/'.$full_devel_version) ?>
+<?php print_servers ('xfce/'.$preview_version) ?>
 </ul>
 <?php } ?>
 
diff --git a/pages/versions.php b/pages/versions.php
index 82e81a5..ebb6a4f 100644
--- a/pages/versions.php
+++ b/pages/versions.php
@@ -1,16 +1,15 @@
 <?php
-  /* latest stable release version */
-  $major_stable_version = 4;
-  $manor_stable_version = 6;
-  $micro_stable_version = 2;
-  $full_stable_version = $major_stable_version.'.'.$manor_stable_version.'.'.$micro_stable_version;
+  /**
+   * Always check the version number in the download page, all the mirror
+   * links should open a folder in teh archive
+   **/
 
-  /* version of the master branch in core */
-  $major_devel_version = 4;
-  $manor_devel_version = 8;
-  $micro_devel_version = 'pre1';
-  $full_devel_version = $major_devel_version.'.'.$manor_devel_version.$micro_devel_version;
+  /* latest stable release version */
+  $stable_version = '4.6.2';
+  $stable_date = '2010-05-23';
 
-  /* set to true if there is a devel release, newer then the stable release */
-  $devel_version = TRUE;
+  /* latest development version */
+  $preview_version = '4.8pre1';
+  $preview_date = '2010-07-11';
+  $preview_visible = TRUE /* set to true if preview is *newer* then stable */
 ?>