git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 3e60d4cb authored by Siebrand Mazeland's avatar Siebrand Mazeland

Number parameters in messages that have multiple parameters

Trim trailing whitespace
Leading tabs to spaces
Remove superfluous whitespace
parent 0e2d9432
This diff is collapsed.
......@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* Title of module
*
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
......@@ -44,8 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class FollowListItem extends SystemListItem
{
}
......@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* List item for when you join a group
*
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
......@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class JoinListItem extends SystemListItem
{
function showContent()
......@@ -53,21 +52,20 @@ class JoinListItem extends SystemListItem
$out = $this->nli->out;
$mem = Group_member::staticGet('uri', $notice->uri);
if (!empty($mem)) {
$out->elementStart('div', 'join-activity');
$profile = $mem->getMember();
$group = $mem->getGroup();
$out->raw(sprintf(_m('<a href="%s">%s</a> joined the group <a href="%s">%s</a>.'),
$out->raw(sprintf(_m('<a href="%1$s">%2$s</a> joined the group <a href="%3$s">%4$s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$group->homeUrl(),
$group->getBestName()));
$out->elementEnd('div');
} else {
parent::showContent();
}
}
}
}
......@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* List item for when you leave a group
*
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
......@@ -44,8 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class LeaveListItem extends SystemListItem
{
}
......@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* Superclass for system event items
*
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
......@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class SystemListItem extends NoticeListItemAdapter
{
/**
......@@ -52,7 +51,6 @@ class SystemListItem extends NoticeListItemAdapter
*
* @return void
*/
function showNotice()
{
$out = $this->nli->out;
......@@ -65,15 +63,15 @@ class SystemListItem extends NoticeListItemAdapter
{
$notice = $this->nli->notice;
$out = $this->nli->out;
// FIXME: get the actual data on the leave
// FIXME: get the actual data on the leave
$out->elementStart('div', 'system-activity');
$out->raw($notice->rendered);
$out->elementEnd('div');
}
}
function showNoticeOptions()
{
......
......@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* Unfollow list item
*
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
......@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class UnfollowListItem extends SystemListItem
{
/**
......@@ -52,7 +51,6 @@ class UnfollowListItem extends SystemListItem
*
* @return void
*/
function showNotice()
{
$out = $this->nli->out;
......@@ -65,14 +63,13 @@ class UnfollowListItem extends SystemListItem
{
$notice = $this->nli->notice;
$out = $this->nli->out;
// FIXME: get the actual data on the leave
$out->elementStart('div', 'unfollow-activity');
$out->raw($notice->rendered);
$out->elementEnd('div');
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment