wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Evan Prodromou 2011-09-17 16:29:58 -04:00
commit e1129f34d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/groupprofileblock.php
View File

@ -117,7 +117,7 @@ class GroupProfileBlock extends ProfileBlock
array('nickname' => $this->group->nickname)), array('nickname' => $this->group->nickname)),
// TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
// TRANS: %s is the nickname of the group. // TRANS: %s is the nickname of the group.
'title' => sprintf(_m('TOOLTIP','Edit %s group properties'), $nickname)), 'title' => sprintf(_m('TOOLTIP','Edit %s group properties'), $this->group->nickname)),
// TRANS: Link text for link on user profile. // TRANS: Link text for link on user profile.
_m('BUTTON','Edit')); _m('BUTTON','Edit'));
$this->out->elementEnd('li'); $this->out->elementEnd('li');
@ -126,7 +126,7 @@ class GroupProfileBlock extends ProfileBlock
array('nickname' => $this->group->nickname)), array('nickname' => $this->group->nickname)),
// TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
// TRANS: %s is the nickname of the group. // TRANS: %s is the nickname of the group.
'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $nickname)), 'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $this->group->nickname)),
// TRANS: Link text for link on user profile. // TRANS: Link text for link on user profile.
_m('MENU','Logo')); _m('MENU','Logo'));
$this->out->elementEnd('li'); $this->out->elementEnd('li');

4
plugins/Event/eventform.php
View File

@ -124,7 +124,7 @@ class EventForm extends Form
$this->li(); $this->li();
$times = EventTimeList::getTimes($today->format('m/d/Y 12:00') . ' am ' . $today->format('T')); $times = EventTimeList::getTimes($today->format('m/d/Y 12:00') . ' am ' . $today->format('T'));
$start = EventTimeList::nearestHalfHour('@' . $today->getTimestamp()); $start = EventTimeList::nearestHalfHour($today->format('c'));
$start->setTimezone(new DateTimeZone(common_timezone())); $start->setTimezone(new DateTimeZone(common_timezone()));
$this->out->dropdown( $this->out->dropdown(
@ -160,7 +160,7 @@ class EventForm extends Form
'event-endtime', 'event-endtime',
// TRANS: Field label on event form. // TRANS: Field label on event form.
_m('LABEL','End time'), _m('LABEL','End time'),
EventTimeList::getTimes('@' . $start->getTimestamp(), true), EventTimeList::getTimes($start->format('c'), true),
// TRANS: Field title on event form. // TRANS: Field title on event form.
_m('Time the event ends.'), _m('Time the event ends.'),
false, false,