clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13151 from annando/bluesky 

Preparation to add Bluesky
This commit is contained in:
Hypolite Petovan 2023-05-21 18:43:20 -04:00 committed by GitHub
parent 1d211bea98 a417d049cb
commit ecfaa950ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/bluesky.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

2
src/Content/ContactSelector.php
View File

@ -141,6 +141,7 @@ class ContactSelector
Protocol::ACTIVITYPUB => DI::l10n()->t('ActivityPub'), Protocol::ACTIVITYPUB => DI::l10n()->t('ActivityPub'),
Protocol::PNUT => DI::l10n()->t('pnut'), Protocol::PNUT => DI::l10n()->t('pnut'),
Protocol::TUMBLR => DI::l10n()->t('Tumblr'), Protocol::TUMBLR => DI::l10n()->t('Tumblr'),
Protocol::BLUESKY => DI::l10n()->t('Bluesky'),
]; ];
Hook::callAll('network_to_name', $nets); Hook::callAll('network_to_name', $nets);
@ -212,6 +213,7 @@ class ContactSelector
Protocol::ACTIVITYPUB => 'activitypub', Protocol::ACTIVITYPUB => 'activitypub',
Protocol::PNUT => 'file-text-o', /// @todo Protocol::PNUT => 'file-text-o', /// @todo
Protocol::TUMBLR => 'tumblr', Protocol::TUMBLR => 'tumblr',
Protocol::BLUESKY => 'circle', /// @todo
]; ];
$platform_icons = ['diaspora' => 'diaspora', 'friendica' => 'friendica', 'friendika' => 'friendica', $platform_icons = ['diaspora' => 'diaspora', 'friendica' => 'friendica', 'friendika' => 'friendica',

1
src/Content/Text/Plaintext.php
View File

@ -26,7 +26,6 @@ use Friendica\DI;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings;
class Plaintext class Plaintext
{ {

1
src/Core/Protocol.php
View File

@ -57,6 +57,7 @@ class Protocol
const TWITTER = 'twit'; // Twitter const TWITTER = 'twit'; // Twitter
const DISCOURSE = 'dscs'; // Discourse const DISCOURSE = 'dscs'; // Discourse
const TUMBLR = 'tmbl'; // Tumblr const TUMBLR = 'tmbl'; // Tumblr
const BLUESKY = 'bsky'; // Bluesky
// Dead protocols // Dead protocols
const APPNET = 'apdn'; // app.net - Dead protocol const APPNET = 'apdn'; // app.net - Dead protocol

54
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2023.05-rc\n" "Project-Id-Version: 2023.05-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-20 12:23+0000\n" "POT-Creation-Date: 2023-05-21 17:30+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"
@ -774,17 +774,17 @@ msgstr ""
msgid "All contacts" msgid "All contacts"
msgstr "" msgstr ""
#: src/BaseModule.php:432 src/Content/Widget.php:239 src/Core/ACL.php:195 #: src/BaseModule.php:432 src/Content/Widget.php:243 src/Core/ACL.php:195
#: src/Module/Contact.php:407 src/Module/PermissionTooltip.php:127 #: src/Module/Contact.php:407 src/Module/PermissionTooltip.php:127
#: src/Module/PermissionTooltip.php:149 #: src/Module/PermissionTooltip.php:149
msgid "Followers" msgid "Followers"
msgstr "" msgstr ""
#: src/BaseModule.php:437 src/Content/Widget.php:240 src/Module/Contact.php:408 #: src/BaseModule.php:437 src/Content/Widget.php:244 src/Module/Contact.php:408
msgid "Following" msgid "Following"
msgstr "" msgstr ""
#: src/BaseModule.php:442 src/Content/Widget.php:241 src/Module/Contact.php:409 #: src/BaseModule.php:442 src/Content/Widget.php:245 src/Module/Contact.php:409
msgid "Mutual friends" msgid "Mutual friends"
msgstr "" msgstr ""
@ -1113,7 +1113,11 @@ msgstr ""
msgid "Tumblr" msgid "Tumblr"
msgstr "" msgstr ""
#: src/Content/ContactSelector.php:179 #: src/Content/ContactSelector.php:144
msgid "Bluesky"
msgstr ""
#: src/Content/ContactSelector.php:180
#, php-format #, php-format
msgid "%s (via %s)" msgid "%s (via %s)"
msgstr "" msgstr ""
@ -1593,7 +1597,7 @@ msgid ""
msgstr "" msgstr ""
#: src/Content/ForumManager.php:151 src/Content/Nav.php:276 #: src/Content/ForumManager.php:151 src/Content/Nav.php:276
#: src/Content/Text/HTML.php:877 src/Content/Widget.php:528 #: src/Content/Text/HTML.php:877 src/Content/Widget.php:532
msgid "Forums" msgid "Forums"
msgstr "" msgstr ""
@ -1601,12 +1605,12 @@ msgstr ""
msgid "External link to forum" msgid "External link to forum"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:156 src/Content/Widget.php:507 #: src/Content/ForumManager.php:156 src/Content/Widget.php:511
msgid "show less" msgid "show less"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:157 src/Content/Widget.php:409 #: src/Content/ForumManager.php:157 src/Content/Widget.php:413
#: src/Content/Widget.php:508 #: src/Content/Widget.php:512
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -2128,72 +2132,72 @@ msgstr ""
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: src/Content/Widget.php:215 src/Model/Group.php:596 #: src/Content/Widget.php:219 src/Model/Group.php:596
#: src/Module/Contact.php:394 src/Module/Welcome.php:76 #: src/Module/Contact.php:394 src/Module/Welcome.php:76
msgid "Groups" msgid "Groups"
msgstr "" msgstr ""
#: src/Content/Widget.php:217 #: src/Content/Widget.php:221
msgid "Everyone" msgid "Everyone"
msgstr "" msgstr ""
#: src/Content/Widget.php:246 #: src/Content/Widget.php:250
msgid "Relationships" msgid "Relationships"
msgstr "" msgstr ""
#: src/Content/Widget.php:248 src/Module/Contact.php:338 #: src/Content/Widget.php:252 src/Module/Contact.php:338
#: src/Module/Group.php:291 #: src/Module/Group.php:291
msgid "All Contacts" msgid "All Contacts"
msgstr "" msgstr ""
#: src/Content/Widget.php:287 #: src/Content/Widget.php:291
msgid "Protocols" msgid "Protocols"
msgstr "" msgstr ""
#: src/Content/Widget.php:289 #: src/Content/Widget.php:293
msgid "All Protocols" msgid "All Protocols"
msgstr "" msgstr ""
#: src/Content/Widget.php:317 #: src/Content/Widget.php:321
msgid "Saved Folders" msgid "Saved Folders"
msgstr "" msgstr ""
#: src/Content/Widget.php:319 src/Content/Widget.php:350 #: src/Content/Widget.php:323 src/Content/Widget.php:354
msgid "Everything" msgid "Everything"
msgstr "" msgstr ""
#: src/Content/Widget.php:348 #: src/Content/Widget.php:352
msgid "Categories" msgid "Categories"
msgstr "" msgstr ""
#: src/Content/Widget.php:405 #: src/Content/Widget.php:409
#, php-format #, php-format
msgid "%d contact in common" msgid "%d contact in common"
msgid_plural "%d contacts in common" msgid_plural "%d contacts in common"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Content/Widget.php:501 #: src/Content/Widget.php:505
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
#: src/Content/Widget.php:525 #: src/Content/Widget.php:529
msgid "Persons" msgid "Persons"
msgstr "" msgstr ""
#: src/Content/Widget.php:526 #: src/Content/Widget.php:530
msgid "Organisations" msgid "Organisations"
msgstr "" msgstr ""
#: src/Content/Widget.php:527 src/Model/Contact.php:1651 #: src/Content/Widget.php:531 src/Model/Contact.php:1651
msgid "News" msgid "News"
msgstr "" msgstr ""
#: src/Content/Widget.php:531 src/Module/Settings/Account.php:453 #: src/Content/Widget.php:535 src/Module/Settings/Account.php:453
msgid "Account Types" msgid "Account Types"
msgstr "" msgstr ""
#: src/Content/Widget.php:532 src/Module/Moderation/BaseUsers.php:69 #: src/Content/Widget.php:536 src/Module/Moderation/BaseUsers.php:69
msgid "All" msgid "All"
msgstr "" msgstr ""