Merge branch '1.1.x'

diff --git a/plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po
index 0fa5b09a8627afb69b06eaca876d0b720c421645..dee6c3c77121be677932a5e1dc7ad98c15c57c29 100644 (file)
--- a/plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po
@@ -344,7 +344,6 @@ msgstr ""
 "Cordiali saluti,\n"
 "\n"
 "%2$s\n"
-" "
 
 #. TRANS: E-mail subject. %s is the StatusNet sitename.
 #, php-format

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 287e48e48475e4cb267a3ed2ec97c8754ce30ecf..aa1b5835e453abaada3ce98fcc8e40d113962fc6 100644 (file)
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -265,6 +265,13 @@ class RealtimePlugin extends Plugin
                         $profile = Profile::staticGet('id', $channel->user_id);
                     }
                     if ($notice->inScope($profile)) {
+                        $this->log(LOG_INFO, 
+                                   sprintf(_("Delivering notice %d to channel (%s, %s, %s) for user '%s'"),
+                                           $notice->id,
+                                           $channel->action,
+                                           $channel->arg1,
+                                           $channel->arg2,
+                                           ($profile) ? ($profile->nickname) : "<public>"));
                         $timeline = $this->_pathToChannel(array($channel->channel_key));
                         $this->_publish($timeline, $json);
                     }