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 git://gitorious.org/statusnet/mainline

Browse Source
This commit is contained in:
Ian Denhardt
2011-03-28 03:25:40 -04:00
parent b7aca97d3e 52d29a17a0
commit d36f0707a4
1623 changed files with 85605 additions and 21741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/OStatus/OStatusPlugin.php
View File

@@ -228,7 +228,7 @@ class OStatusPlugin extends Plugin
return false;
}
function onStartGroupSubscribe($output, $group)
function onStartGroupSubscribe($widget, $group)
{
$cur = common_current_user();
@@ -236,7 +236,7 @@ class OStatusPlugin extends Plugin
// Add an OStatus subscribe
$url = common_local_url('ostatusinit',
array('group' => $group->nickname));
$output->element('a', array('href' => $url,
$widget->out->element('a', array('href' => $url,
'class' => 'entity_remote_subscribe'),
// TRANS: Link description for link to join a remote group.
_m('Join'));
@@ -675,7 +675,7 @@ class OStatusPlugin extends Plugin
* it'll be left with a stray membership record.
*
* @param User_group $group
* @param User $user
* @param Profile $user
*
* @return mixed hook return value
*/

15
plugins/OStatus/actions/groupsalmon.php
View File

@@ -149,14 +149,7 @@ class GroupsalmonAction extends SalmonAction
}
try {
// @fixme that event currently passes a user from main UI
// Event should probably move into Group_member::join
// and take a Profile object.
//
//if (Event::handle('StartJoinGroup', array($this->group, $profile))) {
Group_member::join($this->group->id, $profile->id);
//Event::handle('EndJoinGroup', array($this->group, $profile));
//}
$profile->joinGroup($this->group);
} catch (Exception $e) {
// TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
$this->serverError(sprintf(_m('Could not join remote user %1$s to group %2$s.'),
@@ -181,11 +174,7 @@ class GroupsalmonAction extends SalmonAction
$profile = $oprofile->localProfile();
try {
// @fixme event needs to be refactored as above
//if (Event::handle('StartLeaveGroup', array($this->group, $profile))) {
Group_member::leave($this->group->id, $profile->id);
//Event::handle('EndLeaveGroup', array($this->group, $profile));
//}
$profile->leaveGroup($this->group);
} catch (Exception $e) {
// TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
$this->serverError(sprintf(_m('Could not remove remote user %1$s from group %2$s.'),

16
plugins/OStatus/actions/ostatusgroup.php
View File

@@ -141,18 +141,12 @@ class OStatusGroupAction extends OStatusSubAction
return;
}
if (Event::handle('StartJoinGroup', array($group, $user))) {
$ok = Group_member::join($this->oprofile->group_id, $user->id);
if ($ok) {
Event::handle('EndJoinGroup', array($group, $user));
$this->success();
} else {
// TRANS: OStatus remote group subscription dialog error.
$this->showForm(_m('Remote group join failed!'));
}
} else {
try {
$user->joinGroup($group);
} catch (Exception $e) {
// TRANS: OStatus remote group subscription dialog error.
$this->showForm(_m('Remote group join aborted!'));
$this->showForm(_m('Remote group join failed!'));
return;
}
}

21
plugins/OStatus/locale/OStatus.pot
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"POT-Creation-Date: 2011-03-24 11:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -317,22 +317,17 @@ msgid "Already a member!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:151
#: actions/ostatusgroup.php:148
msgid "Remote group join failed!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:155
msgid "Remote group join aborted!"
msgstr ""
#. TRANS: Page title for OStatus remote group join form
#: actions/ostatusgroup.php:167
#: actions/ostatusgroup.php:161
msgid "Confirm joining remote group"
msgstr ""
#. TRANS: Instructions.
#: actions/ostatusgroup.php:178
#: actions/ostatusgroup.php:172
msgid ""
"You can subscribe to groups from other supported sites. Paste the group's "
"profile URI below:"
@@ -396,7 +391,7 @@ msgid "Can't read profile to set up group membership."
msgstr ""
#. TRANS: Client error.
#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
#: actions/groupsalmon.php:134 actions/groupsalmon.php:170
msgid "Groups can't join groups."
msgstr ""
@@ -405,17 +400,17 @@ msgid "You have been blocked from that group by the admin."
msgstr ""
#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
#: actions/groupsalmon.php:162
#: actions/groupsalmon.php:155
#, php-format
msgid "Could not join remote user %1$s to group %2$s."
msgstr ""
#: actions/groupsalmon.php:174
#: actions/groupsalmon.php:167
msgid "Can't read profile to cancel group membership."
msgstr ""
#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
#: actions/groupsalmon.php:191
#: actions/groupsalmon.php:180
#, php-format
msgid "Could not remove remote user %1$s from group %2$s."
msgstr ""

12
plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
View File

@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:06:52+0000\n"
"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-03-24 15:25:40+0000\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -285,10 +285,6 @@ msgstr "Bereits Mitglied!"
msgid "Remote group join failed!"
msgstr "Beitritt in Remote-Gruppe fehlgeschlagen!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Beitritt in Remote-Gruppe abgebrochen!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Bestätige das Beitreten einer Remotegruppe"

12
plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
View File

@@ -11,13 +11,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:06:52+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-03-24 15:25:40+0000\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -297,10 +297,6 @@ msgstr "Déjà membre !"
msgid "Remote group join failed!"
msgstr "L’adhésion au groupe distant a échoué !"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "L’adhésion au groupe distant a été avortée !"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Confirmer l’adhésion au groupe distant"

12
plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
View File

@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:06:52+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-03-24 15:25:40+0000\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -284,10 +284,6 @@ msgstr "Ja membro!"
msgid "Remote group join failed!"
msgstr "Le adhesion al gruppo remote ha fallite!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Le adhesion al gruppo remote ha essite abortate!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Confirmar adhesion a gruppo remote"

12
plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
View File

@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:06:52+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-03-24 15:25:40+0000\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -282,10 +282,6 @@ msgstr "Веќе членувате!"
msgid "Remote group join failed!"
msgstr "Придружувањето на далечинската група не успеа!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Придружувањето на далечинската група е откажано!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Потврди придружување кон далечинска група."

14
plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
View File

@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:06:52+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-03-24 15:25:40+0000\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -223,7 +223,7 @@ msgstr "Bevestigen"
#. TRANS: Tooltip for button "Confirm".
msgid "Subscribe to this user"
msgstr "Abonneren op deze gebruiker"
msgstr "Op deze gebruiker abonneren"
msgid "You are already subscribed to this user."
msgstr "U bent al geabonneerd op deze gebruiker."
@@ -293,10 +293,6 @@ msgstr "U bent al lid!"
msgid "Remote group join failed!"
msgstr "Het verlaten van de groep bij een andere dienst is mislukt."
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Het lid worden van de groep bij een andere dienst is afgebroken."
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Lid worden van groep bij andere dienst"

12
plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
View File

@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:06:53+0000\n"
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-03-24 15:25:40+0000\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -287,10 +287,6 @@ msgstr "Ви вже учасник!"
msgid "Remote group join failed!"
msgstr "Приєднатися до віддаленої спільноти не вдалося!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Приєднання до віддаленої спільноти перервано!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Підтвердження приєднання до віддаленої спільноти"