eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou
2011-04-21 15:23:22 -04:00
parent 8dd8b58b45 2f48f0f914
commit 963d052653
93 changed files with 1852 additions and 2800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Event/EventPlugin.php
View File

@@ -165,7 +165,8 @@ class EventPlugin extends MicroappPlugin
function saveNoticeFromActivity($activity, $actor, $options=array())
{
if (count($activity->objects) != 1) {
throw new Exception(_('Too many activity objects.'));
// TRANS: Exception thrown when there are too many activity objects.
throw new Exception(_m('Too many activity objects.'));
}
$happeningObj = $activity->objects[0];