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

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
This commit is contained in:
Brion Vibber
2010-12-16 15:56:19 -08:00
parent bf20258f4b f901c25012
commit e79034e163
1104 changed files with 24017 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -1514,8 +1514,11 @@ class Ostatus_profile extends Managed_DataObject
}
// Try the profile url (like foo.example.com or example.com/user/foo)
$profileUrl = ($object->link) ? $object->link : $hints['profileurl'];
if (!empty($object->link)) {
$profileUrl = $object->link;
} else if (!empty($hints['profileurl'])) {
$profileUrl = $hints['profileurl'];
}
if (!empty($profileUrl)) {
$nickname = self::nicknameFromURI($profileUrl);
@@ -1546,9 +1549,11 @@ class Ostatus_profile extends Managed_DataObject
protected static function nicknameFromURI($uri)
{
preg_match('/(\w+):/', $uri, $matches);
$protocol = $matches[1];
if (preg_match('/(\w+):/', $uri, $matches)) {
$protocol = $matches[1];
} else {
return null;
}
switch ($protocol) {
case 'acct':

12
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: 2010-11-29 15:37+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+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"
@@ -228,30 +228,30 @@ msgid "Can't save OStatus profile."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr ""

26
plugins/OStatus/locale/br/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: 2010-11-30 20:16+0000\n"
"PO-Revision-Date: 2010-11-30 20:20:02+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:44+0000\n"
"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -63,7 +63,7 @@ msgstr ""
#: OStatusPlugin.php:656
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
msgstr "%1$s a zo bet er strollad %2$s."
#. TRANS: Exception.
#: OStatusPlugin.php:665
@@ -233,30 +233,30 @@ msgid "Can't save OStatus profile."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr ""
@@ -579,11 +579,11 @@ msgstr "Kadarnaat"
#. TRANS: Tooltip for button "Confirm".
#: actions/ostatussub.php:117
msgid "Subscribe to this user"
msgstr ""
msgstr "En em goumanantiñ d'an implijer-mañ"
#: actions/ostatussub.php:138
msgid "You are already subscribed to this user."
msgstr ""
msgstr "Koumanantet oc'h dija d'an implijerien-mañ."
#: actions/ostatussub.php:167
msgid "Photo"
@@ -719,7 +719,7 @@ msgstr ""
#. TRANS: Page title.
#: actions/ostatusinit.php:218
msgid "OStatus Connect"
msgstr ""
msgstr "Kevreadenn OStatus"
#: actions/pushcallback.php:50
msgid "Empty or invalid feed id."

18
plugins/OStatus/locale/fr/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: 2010-11-30 16:54+0000\n"
"PO-Revision-Date: 2010-11-30 16:58:00+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:44+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-11-29 19:45:02+0000\n"
"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); 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-ostatus\n"
@@ -252,30 +252,30 @@ msgid "Can't save OStatus profile."
msgstr "Impossible de sauvegarder le profil OStatus."
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr "Ce n’est pas une adresse « webfinger » valide."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr "Impossible de sauvegarder le profil pour « %s »."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr "Impossible d’enregistrer le profil OStatus pour « %s »."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr "Impossible de trouver un profil valide pour « %s »."
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr ""
"Impossible de stocker le contenu HTML d’une longue publication en un fichier."

18
plugins/OStatus/locale/gl/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: 2010-11-30 20:16+0000\n"
"PO-Revision-Date: 2010-11-30 20:20:02+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:44+0000\n"
"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -233,30 +233,30 @@ msgid "Can't save OStatus profile."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr ""

18
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: 2010-11-30 16:54+0000\n"
"PO-Revision-Date: 2010-11-30 16:58:00+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:44+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-11-29 19:45:02+0000\n"
"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); 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-ostatus\n"
@@ -240,30 +240,30 @@ msgid "Can't save OStatus profile."
msgstr "Non pote salveguardar profilo OStatus."
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr "Adresse webfinger invalide."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr "Non poteva salveguardar profilo pro \"%s\"."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr "Non poteva salveguardar osatus_profile pro %s."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr "Non poteva trovar un profilo valide pro \"%s\"."
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr "Non poteva immagazinar contento HTML de longe message como file."

18
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: 2010-11-30 16:54+0000\n"
"PO-Revision-Date: 2010-11-30 16:58:00+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:45+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-11-29 19:45:02+0000\n"
"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); 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-ostatus\n"
@@ -243,30 +243,30 @@ msgid "Can't save OStatus profile."
msgstr "Не можам да го зачувам профилот од OStatus."
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr "Ова не е важечка Webfinger-адреса"
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr "Не можам да го зачувам профилот за „%s“."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr "Не можам да го зачувам ostatus_profile за „%s“."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr "Не можев да пронајдам важечки профил за „%s“."
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr ""
"Не можам да ја складирам HTML-содржината на долгата објава како податотека."

18
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: 2010-11-30 16:54+0000\n"
"PO-Revision-Date: 2010-11-30 16:58:00+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:45+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-11-29 19:45:02+0000\n"
"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); 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-ostatus\n"
@@ -255,30 +255,30 @@ msgid "Can't save OStatus profile."
msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr "Geen geldig webfingeradres."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr "Het was niet mogelijk het profiel voor \"%s\" op te slaan."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr "Het was niet mogelijk het ostatus_profile voor \"%s\" op te slaan."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr ""
"Het was niet mogelijk de HTML-inhoud van het lange bericht als bestand op te "

18
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: 2010-11-30 16:54+0000\n"
"PO-Revision-Date: 2010-11-30 16:58:00+0000\n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:45+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-11-29 19:45:02+0000\n"
"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); 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-ostatus\n"
@@ -246,30 +246,30 @@ msgid "Can't save OStatus profile."
msgstr "Не вдається зберегти профіль OStatus."
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
msgid "Not a valid webfinger address."
msgstr "Це недійсна адреса для протоколу WebFinger."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1737
#: classes/Ostatus_profile.php:1742
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr "Не можу зберегти профіль для «%s»."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1756
#: classes/Ostatus_profile.php:1761
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr "Не можу зберегти профіль OStatus для «%s»."
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1764
#: classes/Ostatus_profile.php:1769
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr "не можу знайти відповідний й профіль для «%s»."
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1807
#: classes/Ostatus_profile.php:1812
msgid "Could not store HTML content of long post as file."
msgstr "Не можу зберегти HTML місткого допису у якості файлу."