Ticket #2221: fix for missing whitespace between messages in en-gb.
The final whitespace should be dropped from the source messages after we've stabilized; trailing space is pretty unreliable to keep through translation tools and should be avoided. Use separator strings outside the messages!
This commit is contained in:
parent
1d1bf69f9a
commit
8ee8b89dd8
|
@ -767,11 +767,14 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
{
|
{
|
||||||
$this->element('dt', array('id' => 'site_statusnet_license'), _('StatusNet software license'));
|
$this->element('dt', array('id' => 'site_statusnet_license'), _('StatusNet software license'));
|
||||||
$this->elementStart('dd', null);
|
$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')) {
|
if (common_config('site', 'broughtby')) {
|
||||||
$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
|
$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
|
||||||
} else {
|
} else {
|
||||||
$instr = _('**%%site.name%%** is a microblogging service. ');
|
$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);
|
$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);
|
$output = common_markup_to_html($instr);
|
||||||
$this->raw($output);
|
$this->raw($output);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user