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

Merge pull request #12114 from MrPetovan/bug/12112-unFollow 

Fix capitalization of unfollow links in Model\Contact
This commit is contained in:
Michael Vogel 2022-11-06 00:21:27 +01:00 committed by GitHub
parent c6ca3400ec c7638e0d0c
commit ea49ab6e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Contact.php
View File

@ -1192,7 +1192,7 @@ class Contact
'network' => [DI::l10n()->t('Network Posts') , $posts_link , false], 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false],
'edit' => [DI::l10n()->t('View Contact') , $contact_url , false], 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false],
'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true], 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true],
'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link, true], 'unfollow'=> [DI::l10n()->t('Unfollow') , $unfollow_link, true],
]; ];
} else { } else {
$menu = [ $menu = [
@ -1203,7 +1203,7 @@ class Contact
'edit' => [DI::l10n()->t('View Contact') , $contact_url , false], 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false],
'pm' => [DI::l10n()->t('Send PM') , $pm_url , false], 'pm' => [DI::l10n()->t('Send PM') , $pm_url , false],
'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true], 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true],
'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link , true], 'unfollow'=> [DI::l10n()->t('Unfollow') , $unfollow_link , true],
]; ];
if (!empty($contact['pending'])) { if (!empty($contact['pending'])) {

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.12-dev\n" "Project-Id-Version: 2022.12-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-04 08:00-0400\n" "POT-Creation-Date: 2022-11-05 17:58-0400\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"
@ -2073,7 +2073,7 @@ msgstr ""
msgid "show more" msgid "show more"
msgstr "" msgstr ""
#: src/Content/Item.php:295 src/Model/Item.php:2875 #: src/Content/Item.php:295 src/Model/Item.php:2870
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -2082,7 +2082,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: src/Content/Item.php:304 src/Model/Item.php:2877 #: src/Content/Item.php:304 src/Model/Item.php:2872
#: src/Module/Post/Tag/Add.php:123 #: src/Module/Post/Tag/Add.php:123
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -2441,8 +2441,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:1243 src/Model/Item.php:3476 #: src/Content/Text/BBCode.php:1243 src/Model/Item.php:3471
#: src/Model/Item.php:3482 src/Model/Item.php:3483 #: src/Model/Item.php:3477 src/Model/Item.php:3478
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -2675,7 +2675,8 @@ msgstr ""
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:461 #: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1195
#: src/Model/Contact.php:1206 src/Model/Profile.php:461
msgid "Unfollow" msgid "Unfollow"
msgstr "" msgstr ""
@ -3363,10 +3364,6 @@ msgstr ""
msgid "Legacy module file not found: %s" msgid "Legacy module file not found: %s"
msgstr "" msgstr ""
#: src/Model/Contact.php:1195 src/Model/Contact.php:1206
msgid "UnFollow"
msgstr ""
#: src/Model/Contact.php:1212 src/Module/Admin/Users/Pending.php:107 #: src/Model/Contact.php:1212 src/Module/Admin/Users/Pending.php:107
#: src/Module/Notifications/Introductions.php:132 #: src/Module/Notifications/Introductions.php:132
#: src/Module/Notifications/Introductions.php:204 #: src/Module/Notifications/Introductions.php:204
@ -3557,66 +3554,66 @@ msgstr ""
msgid "Edit groups" msgid "Edit groups"
msgstr "" msgstr ""
#: src/Model/Item.php:1987 #: src/Model/Item.php:1982
#, 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:2879 #: src/Model/Item.php:2874
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2881 #: src/Model/Item.php:2876
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:2884 #: src/Model/Item.php:2879
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3025 #: src/Model/Item.php:3020
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3388 #: src/Model/Item.php:3383
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3419 #: src/Model/Item.php:3414
#, php-format #, php-format
msgid "%2$s (%3$d%%, %1$d vote)" msgid "%2$s (%3$d%%, %1$d vote)"
msgid_plural "%2$s (%3$d%%, %1$d votes)" msgid_plural "%2$s (%3$d%%, %1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3421 #: src/Model/Item.php:3416
#, php-format #, php-format
msgid "%2$s (%1$d vote)" msgid "%2$s (%1$d vote)"
msgid_plural "%2$s (%1$d votes)" msgid_plural "%2$s (%1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3426 #: src/Model/Item.php:3421
#, php-format #, php-format
msgid "%d voter. Poll end: %s" msgid "%d voter. Poll end: %s"
msgid_plural "%d voters. Poll end: %s" msgid_plural "%d voters. Poll end: %s"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3428 #: src/Model/Item.php:3423
#, php-format #, php-format
msgid "%d voter." msgid "%d voter."
msgid_plural "%d voters." msgid_plural "%d voters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3430 #: src/Model/Item.php:3425
#, php-format #, php-format
msgid "Poll end: %s" msgid "Poll end: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3464 src/Model/Item.php:3465 #: src/Model/Item.php:3459 src/Model/Item.php:3460
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
@ -6736,7 +6733,7 @@ msgstr ""
msgid "New photo from this URL" msgid "New photo from this URL"
msgstr "" msgstr ""
#: src/Module/Contact/Contacts.php:48 src/Module/Conversation/Network.php:186 #: src/Module/Contact/Contacts.php:48 src/Module/Conversation/Network.php:188
#: src/Module/Group.php:101 #: src/Module/Group.php:101
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
@ -7174,53 +7171,53 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:172 #: src/Module/Conversation/Network.php:174
msgid "No such group" msgid "No such group"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:176 #: src/Module/Conversation/Network.php:178
#, php-format #, php-format
msgid "Group: %s" msgid "Group: %s"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:254 #: src/Module/Conversation/Network.php:256
msgid "Latest Activity" msgid "Latest Activity"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:257 #: src/Module/Conversation/Network.php:259
msgid "Sort by latest activity" msgid "Sort by latest activity"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:262 #: src/Module/Conversation/Network.php:264
msgid "Latest Posts" msgid "Latest Posts"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:265 #: src/Module/Conversation/Network.php:267
msgid "Sort by post received date" msgid "Sort by post received date"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:270 #: src/Module/Conversation/Network.php:272
msgid "Latest Creation" msgid "Latest Creation"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:273 #: src/Module/Conversation/Network.php:275
msgid "Sort by post creation date" msgid "Sort by post creation date"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:278 #: src/Module/Conversation/Network.php:280
#: src/Module/Settings/Profile/Index.php:227 #: src/Module/Settings/Profile/Index.php:227
msgid "Personal" msgid "Personal"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:281 #: src/Module/Conversation/Network.php:283
msgid "Posts that mention or involve you" msgid "Posts that mention or involve you"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:286 src/Object/Post.php:350 #: src/Module/Conversation/Network.php:288 src/Object/Post.php:350
msgid "Starred" msgid "Starred"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:289 #: src/Module/Conversation/Network.php:291
msgid "Favourite Posts" msgid "Favourite Posts"
msgstr "" msgstr ""
@ -8111,11 +8108,11 @@ msgstr ""
msgid "Show unread" msgid "Show unread"
msgstr "" msgstr ""
#: src/Module/Notifications/Ping.php:224 #: src/Module/Notifications/Ping.php:242
msgid "{0} requested registration" msgid "{0} requested registration"
msgstr "" msgstr ""
#: src/Module/Notifications/Ping.php:235 #: src/Module/Notifications/Ping.php:253
#, php-format #, php-format
msgid "{0} and %d others requested registration" msgid "{0} and %d others requested registration"
msgstr "" msgstr ""