diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-13 15:37:54 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-13 15:37:54 -0700 |
commit | 22047f6412811cb340aee6ba49d15257581b5aa9 (patch) | |
tree | e673cc89d1518992ac515be2af86e8f787438520 /plugins/TwitterBridge | |
parent | 3cd03ee6ecb029ce0c27ddd6b3af92d888e1f58f (diff) | |
parent | 6c77d86b7f39c35eac0fcc3f13c0beba3e694318 (diff) |
Merge branch '0.9.x' into twitstream
Diffstat (limited to 'plugins/TwitterBridge')
9 files changed, 98 insertions, 61 deletions
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index 702793c87..14d30b0f4 100644 --- a/plugins/TwitterBridge/locale/TwitterBridge.pot +++ b/plugins/TwitterBridge/locale/TwitterBridge.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+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" @@ -342,19 +342,23 @@ msgstr "" msgid "Unexpected form submission." msgstr "" -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "" -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "" -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "" -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "" diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po index 9c03dc101..5f32404fb 100644 --- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:57:33+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+0000\n" +"PO-Revision-Date: 2010-10-09 14:08:32+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: 2010-10-01 20:39:42+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-03 20:57:34+0000\n" +"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: #out-statusnet-plugin-twitterbridge\n" @@ -386,19 +386,23 @@ msgstr "Ajouter" msgid "Unexpected form submission." msgstr "Soumission de formulaire inattendue." -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "Impossible de supprimer l’utilisateur Twitter." -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "Compte Twitter déconnecté." -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "Impossible de sauvegarder les préférences Twitter." -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "Préférences Twitter enregistrées." diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po index d5be8c0f1..88f0db780 100644 --- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:57:33+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+0000\n" +"PO-Revision-Date: 2010-10-09 14:08:32+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: 2010-10-01 20:39:42+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-03 20:57:34+0000\n" +"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: #out-statusnet-plugin-twitterbridge\n" @@ -376,19 +376,23 @@ msgstr "Adder" msgid "Unexpected form submission." msgstr "Submission de formulario inexpectate." -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "Non poteva remover le usator de Twitter." -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "Conto de Twitter disconnectite." -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "Non poteva salveguardar le preferentias de Twitter." -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "Preferentias de Twitter salveguardate." diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po index 03e7720f8..1bd63616d 100644 --- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:57:33+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+0000\n" +"PO-Revision-Date: 2010-10-09 14:08:32+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: 2010-10-01 20:39:42+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-03 20:57:34+0000\n" +"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: #out-statusnet-plugin-twitterbridge\n" @@ -379,19 +379,23 @@ msgstr "Додај" msgid "Unexpected form submission." msgstr "Неочекувано поднесување на образец." -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "Не можев да го отстранам корисникот на Twitter." -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "Врската со сметката на Twitter е прекината." -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "Не можев да ги зачувам нагодувањата за Twitter." -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "Нагодувањата за Twitter се зачувани." diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po index ed29e9895..ef66b5a9c 100644 --- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:57:33+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+0000\n" +"PO-Revision-Date: 2010-10-09 14:08:32+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: 2010-10-01 20:39:42+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-03 20:57:34+0000\n" +"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: #out-statusnet-plugin-twitterbridge\n" @@ -386,19 +386,23 @@ msgstr "Toevoegen" msgid "Unexpected form submission." msgstr "Het formulier is onverwacht ingezonden." -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "Het was niet mogelijk de Twittergebruiker te verwijderen." -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "De Twittergebruiker is ontkoppeld." -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "Het was niet mogelijk de Twittervoorkeuren op te slaan." -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "De Twitterinstellingen zijn opgeslagen." diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po index a4e716c7e..66a77e680 100644 --- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:57:34+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+0000\n" +"PO-Revision-Date: 2010-10-09 14:08:33+0000\n" "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-01 20:39:42+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-03 20:57:34+0000\n" +"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: #out-statusnet-plugin-twitterbridge\n" @@ -360,19 +360,23 @@ msgstr "Ekle" msgid "Unexpected form submission." msgstr "Beklenmedik form gönderimi." -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "Twitter kullanıcısı silinemedi." -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "Twitter hesabı bağlantısı kesildi." -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "Twitter tercihleri kaydedilemedi." -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "Twitter tercihleriniz kaydedildi." diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po index 46de2797d..228960ff6 100644 --- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:57:34+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+0000\n" +"PO-Revision-Date: 2010-10-09 14:08:33+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: 2010-10-01 20:39:42+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-03 20:57:34+0000\n" +"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: #out-statusnet-plugin-twitterbridge\n" @@ -382,19 +382,23 @@ msgstr "Додати" msgid "Unexpected form submission." msgstr "Несподіване представлення форми." -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "Не вдається видалити користувача Twitter." -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "Акаунт Twitter від’єднано." -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "Не можу зберегти налаштування Twitter." -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "Налаштування Twitter збережено." diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po index fe65d4397..1d3bada15 100644 --- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-03 19:53+0000\n" -"PO-Revision-Date: 2010-10-03 19:57:34+0000\n" +"POT-Creation-Date: 2010-10-09 14:04+0000\n" +"PO-Revision-Date: 2010-10-09 14:08:33+0000\n" "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-" "hans>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-01 20:39:42+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-03 20:57:34+0000\n" +"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: #out-statusnet-plugin-twitterbridge\n" @@ -364,19 +364,23 @@ msgstr "添加" msgid "Unexpected form submission." msgstr "未预料的表单提交。" -#: twittersettings.php:254 +#: twittersettings.php:251 +msgid "No Twitter connection to remove." +msgstr "" + +#: twittersettings.php:259 msgid "Couldn't remove Twitter user." msgstr "无法删除 Twitter 用户。" -#: twittersettings.php:258 +#: twittersettings.php:263 msgid "Twitter account disconnected." msgstr "已取消 Twitter 帐号关联。" -#: twittersettings.php:278 twittersettings.php:288 +#: twittersettings.php:283 twittersettings.php:293 msgid "Couldn't save Twitter preferences." msgstr "无法保存 Twitter 参数设置。" -#: twittersettings.php:292 +#: twittersettings.php:297 msgid "Twitter preferences saved." msgstr "已保存 Twitter 参数设置。" diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index dab8ab34f..33c5eb65b 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -247,6 +247,11 @@ class TwittersettingsAction extends ConnectSettingsAction $user = common_current_user(); $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE); + if (empty($flink)) { + $this->clientError(_m('No Twitter connection to remove.')); + return; + } + $result = $flink->safeDelete(); if (empty($result)) { |