X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fcommon.php;h=ca02a3e7fbc8f7854b570f059bc19abca950198a;hb=1d29ba83150bdd7a23e497ca9a743ac2b6158b6f;hp=6c01c7db490f56854364022f014fcc0c780c1049;hpb=ddf3614c843bcd8d9ecfd0850ac9a8cefae6dbba;p=quix0rs-gnu-social.git diff --git a/lib/common.php b/lib/common.php index 6c01c7db49..ca02a3e7fb 100644 --- a/lib/common.php +++ b/lib/common.php @@ -1,7 +1,7 @@ getCode()) { - throw new PEAR_Exception($err->getMessage(), $err->getCode()); - } - throw new PEAR_Exception($err->getMessage()); -} -PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception'); +// All the fun stuff to actually initialize StatusNet's framework code, +// without loading up a site configuration. +require_once INSTALLDIR . '/lib/framework.php'; try { StatusNet::init(@$server, @$path, @$conffile); } catch (NoConfigException $e) { // XXX: Throw a conniption if database not installed // XXX: Find a way to use htmlwriter for this instead of handcoded markup - echo '
'. _('No configuration file found. ') .'
'; - echo ''. _('I looked for configuration files in the following places: ') .'
';
- echo implode($e->configFiles, '
');
+ // TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+ echo '
'. _('No configuration file found.') .'
'; + // 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 ''. _('I looked for configuration files in the following places:') .'
';
+ echo implode($e->configFiles, '
');
+ // TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
echo '
'. _('You may wish to run the installer to fix this.') .'
'; + // @todo FIXME Link should be in a para? + // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. + // TRANS: The text is link text that leads to the installer page. echo ''. _('Go to the installer.') .''; exit; } -