Merge pull request #10391 from annando/api-applications

API: Tests with various clients, small fixes
This commit is contained in:
Hypolite Petovan 2021-06-10 10:21:36 -04:00 committed by GitHub
commit 328788abe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 143 additions and 104 deletions

View File

@ -11,26 +11,45 @@ Authentication is the same as described in [Using the APIs](help/api#Authenticat
## Clients ## Clients
Supported apps: ### Supported apps
#### Android
- [AndStatus](http://andstatus.org) - [AndStatus](http://andstatus.org)
- [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
- [Husky](https://husky.fwgs.ru) - [Husky](https://husky.fwgs.ru)
- [Roma](https://play.google.com/store/apps/details?id=tech.bigfig.roma)
- [Subway Tooter](https://github.com/tateisu/SubwayTooter) - [Subway Tooter](https://github.com/tateisu/SubwayTooter)
- [Tusky](https://tusky.app) - [Tusky](https://tusky.app)
- [Twidere](https://github.com/TwidereProject/) - [Twidere](https://github.com/TwidereProject/)
- [twitlatte](https://github.com/moko256/twitlatte) - [twitlatte](https://github.com/moko256/twitlatte)
- [Yuito](https://github.com/accelforce/Yuito) - [Yuito](https://github.com/accelforce/Yuito)
#### iOS
- [Amaroq](https://github.com/ReticentJohn/Amaroq/tree/master) - [Amaroq](https://github.com/ReticentJohn/Amaroq/tree/master)
- [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
- [StarPterano](https://apps.apple.com/de/app/starpterano/id1436972796) Uses an OAuth method where you have to manually copy and paste the provided code.
- [Stella](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048?l=ms)
Unsupported apps: ### Unsupported apps
#### Android
- [Fedi](https://play.google.com/store/apps/details?id=com.fediverse.app) Authenticates, but doesn't load posts and throws several errors
- [Fedilab](https://framagit.org/tom79/fedilab) Automatically uses the legacy API, see issue: https://framagit.org/tom79/fedilab/-/issues/520 - [Fedilab](https://framagit.org/tom79/fedilab) Automatically uses the legacy API, see issue: https://framagit.org/tom79/fedilab/-/issues/520
- [Mammut](https://github.com/jamiesanson/Mammut) There are problems with the token request, see issue https://github.com/jamiesanson/Mammut/issues/19 - [Mammut](https://github.com/jamiesanson/Mammut) There are problems with the token request, see issue https://github.com/jamiesanson/Mammut/issues/19
#### iOS
- [Fedi](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281) Authenticates, but doesn't load posts and throws several errors
- [Mast](https://github.com/Beesitech/Mast) Doesn't accept the entered instance name. Claims that it is invalid (Message is: "Not a valid instance (may be closed or dead)") - [Mast](https://github.com/Beesitech/Mast) Doesn't accept the entered instance name. Claims that it is invalid (Message is: "Not a valid instance (may be closed or dead)")
- [Pinafore](https://github.com/nolanlawson/pinafore) Returns message "Error: NetworkError when attempting to fetch resource.. Is this a valid Mastodon instance?"
- [Mastonaut](https://mastonaut.app/) - [Mastonaut](https://mastonaut.app/)
- [Roma](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699) Authenticates, but doesn't load content
- [Toot!](https://apps.apple.com/app/toot/id1229021451) - [Toot!](https://apps.apple.com/app/toot/id1229021451)
- [Tootle](https://apps.apple.com/de/app/tootle-for-mastodon/id1236013466) Doesn't recognize server, loads /api/v1/instance in some endless loop
#### Other
- [Halycon](https://www.halcyon.social/) Doesn't load content, creates masses of HTTP requests - [Halycon](https://www.halcyon.social/) Doesn't load content, creates masses of HTTP requests
- [Pinafore](https://github.com/nolanlawson/pinafore) Returns message "Error: NetworkError when attempting to fetch resource.. Is this a valid Mastodon instance?"
## Entities ## Entities

View File

@ -39,6 +39,6 @@ class VerifyCredentials extends BaseApi
DI::mstdnError()->Unauthorized(); DI::mstdnError()->Unauthorized();
} }
System::jsonExit($application['id']); System::jsonExit(DI::mstdnApplication()->createFromApplicationId($application['id']));
} }
} }

View File

@ -32,6 +32,8 @@ use Friendica\Security\OAuth;
*/ */
class Authorize extends BaseApi class Authorize extends BaseApi
{ {
private static $oauth_code = '';
/** /**
* @param array $parameters * @param array $parameters
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@ -88,6 +90,19 @@ class Authorize extends BaseApi
DI::mstdnError()->UnprocessableEntity(); DI::mstdnError()->UnprocessableEntity();
} }
DI::app()->redirect($application['redirect_uri'] . (strpos($application['redirect_uri'], '?') ? '&' : '?') . http_build_query(['code' => $token['code'], 'state' => $request['state']])); if ($application['redirect_uri'] != 'urn:ietf:wg:oauth:2.0:oob') {
DI::app()->redirect($application['redirect_uri'] . (strpos($application['redirect_uri'], '?') ? '&' : '?') . http_build_query(['code' => $token['code'], 'state' => $request['state']]));
}
self::$oauth_code = $token['code'];
}
public static function content(array $parameters = [])
{
if (empty(self::$oauth_code)) {
return '';
}
return DI::l10n()->t('Please copy the following authentication code into your application and close this window: %s', self::$oauth_code);
} }
} }

View File

@ -34,7 +34,7 @@ class Application extends BaseDataTransferObject
protected $client_id; protected $client_id;
/** @var string */ /** @var string */
protected $client_secret; protected $client_secret;
/** @var int */ /** @var string */
protected $id; protected $id;
/** @var string */ /** @var string */
protected $name; protected $name;
@ -53,7 +53,7 @@ class Application extends BaseDataTransferObject
{ {
$this->client_id = $client_id; $this->client_id = $client_id;
$this->client_secret = $client_secret; $this->client_secret = $client_secret;
$this->id = $id; $this->id = (string)$id;
$this->name = $name; $this->name = $name;
$this->redirect_uri = $redirect_uri; $this->redirect_uri = $redirect_uri;
$this->website = $website; $this->website = $website;

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.06-rc\n" "Project-Id-Version: 2021.06-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-29 20:29+0000\n" "POT-Creation-Date: 2021-06-10 06:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,26 +18,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: include/api.php:1137 #: include/api.php:1143
#, php-format #, php-format
msgid "Daily posting limit of %d post reached. The post was rejected." msgid "Daily posting limit of %d post reached. The post was rejected."
msgid_plural "Daily posting limit of %d posts reached. The post was rejected." msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: include/api.php:1151 #: include/api.php:1157
#, php-format #, php-format
msgid "Weekly posting limit of %d post reached. The post was rejected." msgid "Weekly posting limit of %d post reached. The post was rejected."
msgid_plural "Weekly posting limit of %d posts reached. The post was rejected." msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: include/api.php:1165 #: include/api.php:1171
#, php-format #, php-format
msgid "Monthly posting limit of %d post reached. The post was rejected." msgid "Monthly posting limit of %d post reached. The post was rejected."
msgstr "" msgstr ""
#: include/api.php:4528 mod/photos.php:107 mod/photos.php:211 #: include/api.php:4534 mod/photos.php:107 mod/photos.php:211
#: mod/photos.php:639 mod/photos.php:1043 mod/photos.php:1060 #: mod/photos.php:639 mod/photos.php:1043 mod/photos.php:1060
#: mod/photos.php:1609 src/Model/User.php:1100 src/Model/User.php:1108 #: mod/photos.php:1609 src/Model/User.php:1100 src/Model/User.php:1108
#: src/Model/User.php:1116 src/Module/Settings/Profile/Photo/Crop.php:97 #: src/Model/User.php:1116 src/Module/Settings/Profile/Photo/Crop.php:97
@ -54,7 +54,7 @@ msgstr ""
msgid "%1$s poked %2$s" msgid "%1$s poked %2$s"
msgstr "" msgstr ""
#: include/conversation.php:227 src/Model/Item.php:2587 #: include/conversation.php:227 src/Model/Item.php:2605
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -62,7 +62,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: include/conversation.php:235 mod/tagger.php:90 src/Model/Item.php:2589 #: include/conversation.php:235 mod/tagger.php:90 src/Model/Item.php:2607
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -184,32 +184,32 @@ msgstr ""
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: include/conversation.php:948 src/Model/Contact.php:986 #: include/conversation.php:948 src/Model/Contact.php:999
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: include/conversation.php:949 include/conversation.php:971 #: include/conversation.php:949 include/conversation.php:971
#: src/Model/Contact.php:912 src/Model/Contact.php:978 #: src/Model/Contact.php:925 src/Model/Contact.php:991
#: src/Model/Contact.php:987 src/Module/Directory.php:166 #: src/Model/Contact.php:1000 src/Module/Directory.php:166
#: src/Module/Settings/Profile/Index.php:240 #: src/Module/Settings/Profile/Index.php:240
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: include/conversation.php:950 src/Model/Contact.php:988 #: include/conversation.php:950 src/Model/Contact.php:1001
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: include/conversation.php:951 src/Model/Contact.php:979 #: include/conversation.php:951 src/Model/Contact.php:992
#: src/Model/Contact.php:989 #: src/Model/Contact.php:1002
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: include/conversation.php:952 src/Model/Contact.php:980 #: include/conversation.php:952 src/Model/Contact.php:993
#: src/Model/Contact.php:990 #: src/Model/Contact.php:1003
msgid "View Contact" msgid "View Contact"
msgstr "" msgstr ""
#: include/conversation.php:953 src/Model/Contact.php:992 #: include/conversation.php:953 src/Model/Contact.php:1005
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -232,12 +232,12 @@ msgstr ""
msgid "Languages" msgid "Languages"
msgstr "" msgstr ""
#: include/conversation.php:963 src/Model/Contact.php:993 #: include/conversation.php:963 src/Model/Contact.php:1006
msgid "Poke" msgid "Poke"
msgstr "" msgstr ""
#: include/conversation.php:968 mod/follow.php:146 src/Content/Widget.php:76 #: include/conversation.php:968 mod/follow.php:146 src/Content/Widget.php:76
#: src/Model/Contact.php:981 src/Model/Contact.php:994 #: src/Model/Contact.php:994 src/Model/Contact.php:1007
#: view/theme/vier/theme.php:172 #: view/theme/vier/theme.php:172
msgid "Connect/Follow" msgid "Connect/Follow"
msgstr "" msgstr ""
@ -478,7 +478,7 @@ msgstr ""
#: include/conversation.php:1241 mod/dfrn_request.php:642 mod/editpost.php:128 #: include/conversation.php:1241 mod/dfrn_request.php:642 mod/editpost.php:128
#: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/follow.php:152 #: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/follow.php:152
#: mod/photos.php:1037 mod/photos.php:1143 mod/tagrm.php:37 mod/tagrm.php:127 #: mod/photos.php:1037 mod/photos.php:1143 mod/tagrm.php:37 mod/tagrm.php:129
#: mod/unfollow.php:100 src/Module/Contact.php:467 #: mod/unfollow.php:100 src/Module/Contact.php:467
#: src/Module/RemoteFollow.php:110 #: src/Module/RemoteFollow.php:110
msgid "Cancel" msgid "Cancel"
@ -824,8 +824,8 @@ msgid "Please visit %s to approve or reject the request."
msgstr "" msgstr ""
#: mod/api.php:52 mod/api.php:57 mod/dfrn_confirm.php:78 mod/editpost.php:37 #: mod/api.php:52 mod/api.php:57 mod/dfrn_confirm.php:78 mod/editpost.php:37
#: mod/events.php:231 mod/follow.php:55 mod/follow.php:135 mod/item.php:184 #: mod/events.php:231 mod/follow.php:55 mod/follow.php:135 mod/item.php:185
#: mod/item.php:189 mod/item.php:909 mod/message.php:69 mod/message.php:112 #: mod/item.php:190 mod/item.php:910 mod/message.php:69 mod/message.php:112
#: mod/notes.php:44 mod/ostatus_subscribe.php:30 mod/photos.php:176 #: mod/notes.php:44 mod/ostatus_subscribe.php:30 mod/photos.php:176
#: mod/photos.php:922 mod/repair_ostatus.php:31 mod/settings.php:47 #: mod/photos.php:922 mod/repair_ostatus.php:31 mod/settings.php:47
#: mod/settings.php:65 mod/settings.php:498 mod/suggest.php:34 #: mod/settings.php:65 mod/settings.php:498 mod/suggest.php:34
@ -833,10 +833,8 @@ msgstr ""
#: mod/unfollow.php:82 mod/wall_attach.php:78 mod/wall_attach.php:81 #: mod/unfollow.php:82 mod/wall_attach.php:78 mod/wall_attach.php:81
#: mod/wall_upload.php:99 mod/wall_upload.php:102 mod/wallmessage.php:35 #: mod/wall_upload.php:99 mod/wall_upload.php:102 mod/wallmessage.php:35
#: mod/wallmessage.php:59 mod/wallmessage.php:96 mod/wallmessage.php:120 #: mod/wallmessage.php:59 mod/wallmessage.php:96 mod/wallmessage.php:120
#: src/Module/Attach.php:56 src/Module/BaseApi.php:74 src/Module/BaseApi.php:80 #: src/Module/Attach.php:56 src/Module/BaseApi.php:69 src/Module/BaseApi.php:80
#: src/Module/BaseApi.php:87 src/Module/BaseApi.php:93 #: src/Module/BaseApi.php:91 src/Module/BaseApi.php:102
#: src/Module/BaseApi.php:100 src/Module/BaseApi.php:106
#: src/Module/BaseApi.php:113 src/Module/BaseApi.php:119
#: src/Module/BaseNotifications.php:88 src/Module/Contact.php:385 #: src/Module/BaseNotifications.php:88 src/Module/Contact.php:385
#: src/Module/Contact/Advanced.php:43 src/Module/Delegation.php:118 #: src/Module/Contact/Advanced.php:43 src/Module/Delegation.php:118
#: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44 #: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44
@ -903,7 +901,7 @@ msgstr ""
msgid "User not found." msgid "User not found."
msgstr "" msgstr ""
#: mod/cal.php:143 mod/display.php:283 src/Module/Profile/Profile.php:94 #: mod/cal.php:143 mod/display.php:284 src/Module/Profile/Profile.php:94
#: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:109 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:109
#: src/Module/Update/Profile.php:55 #: src/Module/Update/Profile.php:55
msgid "Access to this profile has been restricted." msgid "Access to this profile has been restricted."
@ -954,7 +952,7 @@ msgstr ""
#: mod/cal.php:297 src/Console/User.php:182 src/Model/User.php:662 #: mod/cal.php:297 src/Console/User.php:182 src/Model/User.php:662
#: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74 #: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74
#: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71 #: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71
#: src/Module/Api/Twitter/ContactEndpoint.php:73 #: src/Module/Api/Twitter/ContactEndpoint.php:71
msgid "User not found" msgid "User not found"
msgstr "" msgstr ""
@ -1117,11 +1115,11 @@ msgstr ""
msgid "Invalid profile URL." msgid "Invalid profile URL."
msgstr "" msgstr ""
#: mod/dfrn_request.php:355 src/Model/Contact.php:2164 #: mod/dfrn_request.php:355 src/Model/Contact.php:2177
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: mod/dfrn_request.php:361 src/Model/Contact.php:2169 #: mod/dfrn_request.php:361 src/Model/Contact.php:2182
#: src/Module/Friendica.php:80 #: src/Module/Friendica.php:80
msgid "Blocked domain" msgid "Blocked domain"
msgstr "" msgstr ""
@ -1217,11 +1215,11 @@ msgstr ""
msgid "Add a personal note:" msgid "Add a personal note:"
msgstr "" msgstr ""
#: mod/display.php:235 mod/display.php:319 #: mod/display.php:235 mod/display.php:320
msgid "The requested item doesn't exist or has been deleted." msgid "The requested item doesn't exist or has been deleted."
msgstr "" msgstr ""
#: mod/display.php:399 #: mod/display.php:400
msgid "The feed for this item is unavailable." msgid "The feed for this item is unavailable."
msgstr "" msgstr ""
@ -1433,27 +1431,27 @@ msgstr ""
msgid "The contact could not be added." msgid "The contact could not be added."
msgstr "" msgstr ""
#: mod/item.php:135 mod/item.php:139 #: mod/item.php:136 mod/item.php:140
msgid "Unable to locate original post." msgid "Unable to locate original post."
msgstr "" msgstr ""
#: mod/item.php:340 mod/item.php:345 #: mod/item.php:341 mod/item.php:346
msgid "Empty post discarded." msgid "Empty post discarded."
msgstr "" msgstr ""
#: mod/item.php:709 #: mod/item.php:717
msgid "Post updated." msgid "Post updated."
msgstr "" msgstr ""
#: mod/item.php:726 mod/item.php:731 #: mod/item.php:727 mod/item.php:732
msgid "Item wasn't stored." msgid "Item wasn't stored."
msgstr "" msgstr ""
#: mod/item.php:742 #: mod/item.php:743
msgid "Item couldn't be fetched." msgid "Item couldn't be fetched."
msgstr "" msgstr ""
#: mod/item.php:888 src/Module/Admin/Themes/Details.php:39 #: mod/item.php:889 src/Module/Admin/Themes/Details.php:39
#: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:47 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:47
#: src/Module/Debug/ItemBody.php:60 #: src/Module/Debug/ItemBody.php:60
msgid "Item not found." msgid "Item not found."
@ -2857,15 +2855,15 @@ msgstr ""
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "" msgstr ""
#: mod/tagrm.php:113 #: mod/tagrm.php:115
msgid "Remove Item Tag" msgid "Remove Item Tag"
msgstr "" msgstr ""
#: mod/tagrm.php:115 #: mod/tagrm.php:117
msgid "Select a tag to remove: " msgid "Select a tag to remove: "
msgstr "" msgstr ""
#: mod/tagrm.php:126 src/Module/Settings/Delegation.php:179 #: mod/tagrm.php:128 src/Module/Settings/Delegation.php:179
#: src/Module/Settings/TwoFactor/Trusted.php:104 #: src/Module/Settings/TwoFactor/Trusted.php:104
msgid "Remove" msgid "Remove"
msgstr "" msgstr ""
@ -3012,12 +3010,12 @@ msgstr ""
msgid "toggle mobile" msgid "toggle mobile"
msgstr "" msgstr ""
#: src/App/Router.php:234 #: src/App/Router.php:236
#, php-format #, php-format
msgid "Method not allowed for this module. Allowed method(s): %s" msgid "Method not allowed for this module. Allowed method(s): %s"
msgstr "" msgstr ""
#: src/App/Router.php:236 src/Module/HTTPException/PageNotFound.php:32 #: src/App/Router.php:238 src/Module/HTTPException/PageNotFound.php:32
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
@ -3647,8 +3645,8 @@ msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1091 src/Model/Item.php:3095 #: src/Content/Text/BBCode.php:1091 src/Model/Item.php:3113
#: src/Model/Item.php:3101 src/Model/Item.php:3102 #: src/Model/Item.php:3119 src/Model/Item.php:3120
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -3803,7 +3801,7 @@ msgstr ""
msgid "Organisations" msgid "Organisations"
msgstr "" msgstr ""
#: src/Content/Widget.php:532 src/Model/Contact.php:1410 #: src/Content/Widget.php:532 src/Model/Contact.php:1423
msgid "News" msgid "News"
msgstr "" msgstr ""
@ -4624,82 +4622,82 @@ msgstr ""
msgid "Legacy module file not found: %s" msgid "Legacy module file not found: %s"
msgstr "" msgstr ""
#: src/Model/Contact.php:982 src/Model/Contact.php:995 #: src/Model/Contact.php:995 src/Model/Contact.php:1008
msgid "UnFollow" msgid "UnFollow"
msgstr "" msgstr ""
#: src/Model/Contact.php:991 #: src/Model/Contact.php:1004
msgid "Drop Contact" msgid "Drop Contact"
msgstr "" msgstr ""
#: src/Model/Contact.php:1001 src/Module/Admin/Users/Pending.php:107 #: src/Model/Contact.php:1014 src/Module/Admin/Users/Pending.php:107
#: src/Module/Notifications/Introductions.php:111 #: src/Module/Notifications/Introductions.php:111
#: src/Module/Notifications/Introductions.php:189 #: src/Module/Notifications/Introductions.php:189
msgid "Approve" msgid "Approve"
msgstr "" msgstr ""
#: src/Model/Contact.php:1406 #: src/Model/Contact.php:1419
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: src/Model/Contact.php:1414 #: src/Model/Contact.php:1427
msgid "Forum" msgid "Forum"
msgstr "" msgstr ""
#: src/Model/Contact.php:2174 #: src/Model/Contact.php:2187
msgid "Connect URL missing." msgid "Connect URL missing."
msgstr "" msgstr ""
#: src/Model/Contact.php:2183 #: src/Model/Contact.php:2196
msgid "" msgid ""
"The contact could not be added. Please check the relevant network " "The contact could not be added. Please check the relevant network "
"credentials in your Settings -> Social Networks page." "credentials in your Settings -> Social Networks page."
msgstr "" msgstr ""
#: src/Model/Contact.php:2224 #: src/Model/Contact.php:2237
msgid "" msgid ""
"This site is not configured to allow communications with other networks." "This site is not configured to allow communications with other networks."
msgstr "" msgstr ""
#: src/Model/Contact.php:2225 src/Model/Contact.php:2238 #: src/Model/Contact.php:2238 src/Model/Contact.php:2251
msgid "No compatible communication protocols or feeds were discovered." msgid "No compatible communication protocols or feeds were discovered."
msgstr "" msgstr ""
#: src/Model/Contact.php:2236 #: src/Model/Contact.php:2249
msgid "The profile address specified does not provide adequate information." msgid "The profile address specified does not provide adequate information."
msgstr "" msgstr ""
#: src/Model/Contact.php:2241 #: src/Model/Contact.php:2254
msgid "An author or name was not found." msgid "An author or name was not found."
msgstr "" msgstr ""
#: src/Model/Contact.php:2244 #: src/Model/Contact.php:2257
msgid "No browser URL could be matched to this address." msgid "No browser URL could be matched to this address."
msgstr "" msgstr ""
#: src/Model/Contact.php:2247 #: src/Model/Contact.php:2260
msgid "" msgid ""
"Unable to match @-style Identity Address with a known protocol or email " "Unable to match @-style Identity Address with a known protocol or email "
"contact." "contact."
msgstr "" msgstr ""
#: src/Model/Contact.php:2248 #: src/Model/Contact.php:2261
msgid "Use mailto: in front of address to force email check." msgid "Use mailto: in front of address to force email check."
msgstr "" msgstr ""
#: src/Model/Contact.php:2254 #: src/Model/Contact.php:2267
msgid "" msgid ""
"The profile address specified belongs to a network which has been disabled " "The profile address specified belongs to a network which has been disabled "
"on this site." "on this site."
msgstr "" msgstr ""
#: src/Model/Contact.php:2259 #: src/Model/Contact.php:2272
msgid "" msgid ""
"Limited profile. This person will be unable to receive direct/personal " "Limited profile. This person will be unable to receive direct/personal "
"notifications from you." "notifications from you."
msgstr "" msgstr ""
#: src/Model/Contact.php:2318 #: src/Model/Contact.php:2331
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
@ -4816,33 +4814,33 @@ msgstr ""
msgid "Edit groups" msgid "Edit groups"
msgstr "" msgstr ""
#: src/Model/Item.php:1653 #: src/Model/Item.php:1659
#, php-format #, php-format
msgid "Detected languages in this post:\\n%s" msgid "Detected languages in this post:\\n%s"
msgstr "" msgstr ""
#: src/Model/Item.php:2591 #: src/Model/Item.php:2609
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2593 #: src/Model/Item.php:2611
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:2596 #: src/Model/Item.php:2614
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:2710 #: src/Model/Item.php:2728
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3060 #: src/Model/Item.php:3078
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3089 src/Model/Item.php:3090 #: src/Model/Item.php:3107 src/Model/Item.php:3108
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
@ -5091,7 +5089,7 @@ msgid ""
"An error occurred creating your default contact group. Please try again." "An error occurred creating your default contact group. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1254 #: src/Model/User.php:1256
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -5099,7 +5097,7 @@ msgid ""
"\t\t\tthe administrator of %2$s has set up an account for you." "\t\t\tthe administrator of %2$s has set up an account for you."
msgstr "" msgstr ""
#: src/Model/User.php:1257 #: src/Model/User.php:1259
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -5136,12 +5134,12 @@ msgid ""
"\t\tThank you and welcome to %4$s." "\t\tThank you and welcome to %4$s."
msgstr "" msgstr ""
#: src/Model/User.php:1290 src/Model/User.php:1397 #: src/Model/User.php:1292 src/Model/User.php:1399
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: src/Model/User.php:1310 #: src/Model/User.php:1312
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -5157,12 +5155,12 @@ msgid ""
"\t\t" "\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1329 #: src/Model/User.php:1331
#, php-format #, php-format
msgid "Registration at %s" msgid "Registration at %s"
msgstr "" msgstr ""
#: src/Model/User.php:1353 #: src/Model/User.php:1355
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -5171,7 +5169,7 @@ msgid ""
"\t\t\t" "\t\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1361 #: src/Model/User.php:1363
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -7237,11 +7235,11 @@ msgstr ""
msgid "Posts from %s can't be unshared" msgid "Posts from %s can't be unshared"
msgstr "" msgstr ""
#: src/Module/Api/Twitter/ContactEndpoint.php:65 src/Module/Contact.php:400 #: src/Module/Api/Twitter/ContactEndpoint.php:63 src/Module/Contact.php:400
msgid "Contact not found" msgid "Contact not found"
msgstr "" msgstr ""
#: src/Module/Api/Twitter/ContactEndpoint.php:135 #: src/Module/Api/Twitter/ContactEndpoint.php:133
msgid "Profile not found" msgid "Profile not found"
msgstr "" msgstr ""
@ -7339,12 +7337,12 @@ msgstr ""
msgid "User registrations waiting for confirmation" msgid "User registrations waiting for confirmation"
msgstr "" msgstr ""
#: src/Module/BaseApi.php:133 #: src/Module/BaseApi.php:116
#, php-format #, php-format
msgid "API endpoint %s %s is not implemented" msgid "API endpoint %s %s is not implemented"
msgstr "" msgstr ""
#: src/Module/BaseApi.php:134 #: src/Module/BaseApi.php:117
msgid "" msgid ""
"The API endpoint is currently not implemented but might be in the future." "The API endpoint is currently not implemented but might be in the future."
msgstr "" msgstr ""
@ -7704,7 +7702,7 @@ msgstr ""
msgid "Search your contacts" msgid "Search your contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:883 src/Module/Search/Index.php:192 #: src/Module/Contact.php:883 src/Module/Search/Index.php:194
#, php-format #, php-format
msgid "Results for: %s" msgid "Results for: %s"
msgstr "" msgstr ""
@ -7833,7 +7831,7 @@ msgstr ""
msgid "New photo from this URL" msgid "New photo from this URL"
msgstr "" msgstr ""
#: src/Module/Contact/Contacts.php:31 src/Module/Conversation/Network.php:175 #: src/Module/Contact/Contacts.php:31 src/Module/Conversation/Network.php:177
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
@ -7945,7 +7943,7 @@ msgid "Hide"
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:149 src/Module/Search/Index.php:139 #: src/Module/Conversation/Community.php:149 src/Module/Search/Index.php:139
#: src/Module/Search/Index.php:179 #: src/Module/Search/Index.php:181
msgid "No results." msgid "No results."
msgstr "" msgstr ""
@ -7963,45 +7961,45 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:161 #: src/Module/Conversation/Network.php:163
msgid "No such group" msgid "No such group"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:165 #: src/Module/Conversation/Network.php:167
#, php-format #, php-format
msgid "Group: %s" msgid "Group: %s"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:241 #: src/Module/Conversation/Network.php:243
msgid "Latest Activity" msgid "Latest Activity"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:244 #: src/Module/Conversation/Network.php:246
msgid "Sort by latest activity" msgid "Sort by latest activity"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:249 #: src/Module/Conversation/Network.php:251
msgid "Latest Posts" msgid "Latest Posts"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:252 #: src/Module/Conversation/Network.php:254
msgid "Sort by post received date" msgid "Sort by post received date"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:257 #: src/Module/Conversation/Network.php:259
#: src/Module/Settings/Profile/Index.php:242 #: src/Module/Settings/Profile/Index.php:242
msgid "Personal" msgid "Personal"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:260 #: src/Module/Conversation/Network.php:262
msgid "Posts that mention or involve you" msgid "Posts that mention or involve you"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:265 src/Object/Post.php:334 #: src/Module/Conversation/Network.php:267 src/Object/Post.php:334
msgid "Starred" msgid "Starred"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:268 #: src/Module/Conversation/Network.php:270
msgid "Favourite Posts" msgid "Favourite Posts"
msgstr "" msgstr ""
@ -8883,15 +8881,22 @@ msgstr ""
msgid "Show all" msgid "Show all"
msgstr "" msgstr ""
#: src/Module/OAuth/Authorize.php:51 #: src/Module/OAuth/Authorize.php:53
msgid "Unsupported or missing response type" msgid "Unsupported or missing response type"
msgstr "" msgstr ""
#: src/Module/OAuth/Authorize.php:56 src/Module/OAuth/Token.php:57 #: src/Module/OAuth/Authorize.php:58 src/Module/OAuth/Token.php:58
msgid "Incomplete request data" msgid "Incomplete request data"
msgstr "" msgstr ""
#: src/Module/OAuth/Token.php:81 #: src/Module/OAuth/Authorize.php:108
#, php-format
msgid ""
"Please copy the following authentication code into your application and "
"close this window: %s"
msgstr ""
#: src/Module/OAuth/Token.php:82
msgid "Unsupported or missing grant type" msgid "Unsupported or missing grant type"
msgstr "" msgstr ""
@ -9147,7 +9152,7 @@ msgstr ""
msgid "Only one search per minute is permitted for not logged in users." msgid "Only one search per minute is permitted for not logged in users."
msgstr "" msgstr ""
#: src/Module/Search/Index.php:190 #: src/Module/Search/Index.php:192
#, php-format #, php-format
msgid "Items tagged with: %s" msgid "Items tagged with: %s"
msgstr "" msgstr ""