diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
| commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
| tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /lib/common.php | |
| parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
| parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/common.php b/lib/common.php index 0a0f5c631..2a11ab722 100644 --- a/lib/common.php +++ b/lib/common.php @@ -150,11 +150,17 @@ try { } catch (NoConfigException $e) { // 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>'. _('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. + // 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 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>'; + // @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 '<a href="install.php">'. _('Go to the installer.') .'</a>'; exit; } - |