summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-10 09:53:55 -0800
committerBrion Vibber <brion@pobox.com>2010-03-10 09:53:55 -0800
commit58fcb5ac6f91d30a25a4fa03ba87855923c35828 (patch)
tree97a7aa7c87d4d60d14747e1235e43c3a7d731080 /lib
parent7f2253759ccdc5ab8698c447b29762314883db1a (diff)
parent8ee8b89dd8b3483724aa52a812eef89b8bfae38b (diff)
Merge branch 'master' into testing
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/action.php b/lib/action.php
index 816086d20..9884f529c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -767,11 +767,14 @@ class Action extends HTMLOutputter // lawsuit
{
$this->element('dt', array('id' => 'site_statusnet_license'), _('StatusNet software license'));
$this->elementStart('dd', null);
+ // @fixme drop the final spaces in the messages when at good spot
+ // to let translations get updated.
if (common_config('site', 'broughtby')) {
$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
} else {
$instr = _('**%%site.name%%** is a microblogging service. ');
}
+ $instr .= ' ';
$instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
$output = common_markup_to_html($instr);
$this->raw($output);