Revert "Revert "0.9.7alpha1""

[quix0rs-gnu-social.git] / lib / common.php

diff --git a/lib/common.php b/lib/common.php
index c2117164c65aa6969e069810c20f081df8ad02aa..22890b5cb751d8e0336953e10f4d0e72e7e00546 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,10 +22,13 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.6');
+define('STATUSNET_BASE_VERSION', '0.9.7');
+define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
+
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'Man on the Moon');
+define('STATUSNET_CODENAME', 'World Leader Pretend');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -117,6 +120,17 @@ require_once 'markdown.php';
 
 // XXX: other formats here
 
+/**
+ * Avoid the NICKNAME_FMT constant; use the Nickname class instead.
+ *
+ * Nickname::DISPLAY_FMT is more suitable for inserting into regexes;
+ * note that it includes the [] and repeating bits, so should be wrapped
+ * directly in a capture paren usually.
+ *
+ * For validation, use Nickname::normalize(), Nickname::isValid() etc.
+ *
+ * @deprecated
+ */
 define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
 
 require_once INSTALLDIR.'/lib/util.php';
@@ -133,10 +147,10 @@ try {
     // XXX: Throw a conniption if database not installed
     // XXX: Find a way to use htmlwriter for this instead of handcoded markup
     // TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-    echo '<p>'. _('No configuration file found. ') .'</p>';
+    echo '<p>'. _('No configuration file found.') .'</p>';
     // TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
     // TRANS: Is followed by a list of directories (separated by HTML breaks).
-    echo '<p>'. _('I looked for configuration files in the following places: ') .'<br /> ';
+    echo '<p>'. _('I looked for configuration files in the following places:') .'<br /> ';
     echo implode($e->configFiles, '<br />');
     // TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
     echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';