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

Merge pull request #12572 from mexon/mat/network-failure-error 

Return network match failure in error message instead of logging
This commit is contained in:
Hypolite Petovan 2022-12-29 15:11:36 -05:00 committed by GitHub
parent 03e03c126d c0a874b8d4
commit 44818ba556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 78 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Contact.php
View File

@ -2953,7 +2953,7 @@ class Contact
} }
if (($network != '') && ($ret['network'] != $network)) { if (($network != '') && ($ret['network'] != $network)) {
Logger::notice('Expected network ' . $network . ' does not match actual network ' . $ret['network']); $result['message'] = DI::l10n()->t('Expected network %s does not match actual network %s', $network, $ret['network']);
return $result; return $result;
} }

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2023.03-dev\n" "Project-Id-Version: 2023.03-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-28 00:37-0500\n" "POT-Creation-Date: 2022-12-29 20:06+0100\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"
@ -1539,31 +1539,31 @@ msgstr ""
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: src/Content/Item.php:387 src/Model/Contact.php:1198 #: src/Content/Item.php:387 src/Model/Contact.php:1200
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: src/Content/Item.php:388 src/Content/Item.php:406 src/Model/Contact.php:1142 #: src/Content/Item.php:388 src/Content/Item.php:406 src/Model/Contact.php:1144
#: src/Model/Contact.php:1190 src/Model/Contact.php:1199 #: src/Model/Contact.php:1192 src/Model/Contact.php:1201
#: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:234 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:234
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: src/Content/Item.php:389 src/Model/Contact.php:1200 #: src/Content/Item.php:389 src/Model/Contact.php:1202
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: src/Content/Item.php:390 src/Model/Contact.php:1191 #: src/Content/Item.php:390 src/Model/Contact.php:1193
#: src/Model/Contact.php:1201 #: src/Model/Contact.php:1203
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: src/Content/Item.php:391 src/Model/Contact.php:1192 #: src/Content/Item.php:391 src/Model/Contact.php:1194
#: src/Model/Contact.php:1202 #: src/Model/Contact.php:1204
msgid "View Contact" msgid "View Contact"
msgstr "" msgstr ""
#: src/Content/Item.php:392 src/Model/Contact.php:1203 #: src/Content/Item.php:392 src/Model/Contact.php:1205
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -1588,7 +1588,7 @@ msgid "Languages"
msgstr "" msgstr ""
#: src/Content/Item.php:403 src/Content/Widget.php:80 #: src/Content/Item.php:403 src/Content/Widget.php:80
#: src/Model/Contact.php:1193 src/Model/Contact.php:1204 #: src/Model/Contact.php:1195 src/Model/Contact.php:1206
#: src/Module/Contact/Follow.php:166 view/theme/vier/theme.php:196 #: src/Module/Contact/Follow.php:166 view/theme/vier/theme.php:196
msgid "Connect/Follow" msgid "Connect/Follow"
msgstr "" msgstr ""
@ -2081,7 +2081,7 @@ msgstr ""
msgid "Organisations" msgid "Organisations"
msgstr "" msgstr ""
#: src/Content/Widget.php:523 src/Model/Contact.php:1644 #: src/Content/Widget.php:523 src/Model/Contact.php:1648
msgid "News" msgid "News"
msgstr "" msgstr ""
@ -2162,8 +2162,8 @@ msgstr ""
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1194 #: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1196
#: src/Model/Contact.php:1205 src/Model/Profile.php:465 #: src/Model/Contact.php:1207 src/Model/Profile.php:465
#: src/Module/Contact/Profile.php:419 #: src/Module/Contact/Profile.php:419
msgid "Unfollow" msgid "Unfollow"
msgstr "" msgstr ""
@ -2428,8 +2428,8 @@ msgstr ""
#: src/Core/Installer.php:514 #: src/Core/Installer.php:514
msgid "" msgid ""
"The web installer needs to be able to create a file called \"local.config.php" "The web installer needs to be able to create a file called \"local.config."
"\" in the \"config\" folder of your web server and it is unable to do so." "php\" in the \"config\" folder of your web server and it is unable to do so."
msgstr "" msgstr ""
#: src/Core/Installer.php:515 #: src/Core/Installer.php:515
@ -2866,77 +2866,82 @@ msgstr ""
msgid "Legacy module file not found: %s" msgid "Legacy module file not found: %s"
msgstr "" msgstr ""
#: src/Model/Contact.php:1211 src/Module/Moderation/Users/Pending.php:102 #: src/Model/Contact.php:1213 src/Module/Moderation/Users/Pending.php:102
#: src/Module/Notifications/Introductions.php:132 #: src/Module/Notifications/Introductions.php:132
#: src/Module/Notifications/Introductions.php:204 #: src/Module/Notifications/Introductions.php:204
msgid "Approve" msgid "Approve"
msgstr "" msgstr ""
#: src/Model/Contact.php:1640 #: src/Model/Contact.php:1644
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: src/Model/Contact.php:1648 #: src/Model/Contact.php:1652
msgid "Forum" msgid "Forum"
msgstr "" msgstr ""
#: src/Model/Contact.php:2877 #: src/Model/Contact.php:2919
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: src/Model/Contact.php:2882 src/Module/Friendica.php:82 #: src/Model/Contact.php:2924 src/Module/Friendica.php:82
msgid "Blocked domain" msgid "Blocked domain"
msgstr "" msgstr ""
#: src/Model/Contact.php:2887 #: src/Model/Contact.php:2929
msgid "Connect URL missing." msgid "Connect URL missing."
msgstr "" msgstr ""
#: src/Model/Contact.php:2896 #: src/Model/Contact.php:2938
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:2931 #: src/Model/Contact.php:2956
#, php-format
msgid "Expected network %s does not match actual network %s"
msgstr ""
#: src/Model/Contact.php:2973
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:2933 #: src/Model/Contact.php:2975
msgid "No compatible communication protocols or feeds were discovered." msgid "No compatible communication protocols or feeds were discovered."
msgstr "" msgstr ""
#: src/Model/Contact.php:2936 #: src/Model/Contact.php:2978
msgid "An author or name was not found." msgid "An author or name was not found."
msgstr "" msgstr ""
#: src/Model/Contact.php:2939 #: src/Model/Contact.php:2981
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:2942 #: src/Model/Contact.php:2984
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:2943 #: src/Model/Contact.php:2985
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:2949 #: src/Model/Contact.php:2991
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:2954 #: src/Model/Contact.php:2996
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:3019 #: src/Model/Contact.php:3061
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
@ -2963,22 +2968,22 @@ msgid "Sept"
msgstr "" msgstr ""
#: src/Model/Event.php:464 src/Module/Calendar/Show.php:128 #: src/Model/Event.php:464 src/Module/Calendar/Show.php:128
#: src/Util/Temporal.php:339 #: src/Util/Temporal.php:343
msgid "today" msgid "today"
msgstr "" msgstr ""
#: src/Model/Event.php:465 src/Module/Calendar/Show.php:129 #: src/Model/Event.php:465 src/Module/Calendar/Show.php:129
#: src/Module/Settings/Display.php:235 src/Util/Temporal.php:349 #: src/Module/Settings/Display.php:235 src/Util/Temporal.php:353
msgid "month" msgid "month"
msgstr "" msgstr ""
#: src/Model/Event.php:466 src/Module/Calendar/Show.php:130 #: src/Model/Event.php:466 src/Module/Calendar/Show.php:130
#: src/Module/Settings/Display.php:236 src/Util/Temporal.php:350 #: src/Module/Settings/Display.php:236 src/Util/Temporal.php:354
msgid "week" msgid "week"
msgstr "" msgstr ""
#: src/Model/Event.php:467 src/Module/Calendar/Show.php:131 #: src/Model/Event.php:467 src/Module/Calendar/Show.php:131
#: src/Module/Settings/Display.php:237 src/Util/Temporal.php:351 #: src/Module/Settings/Display.php:237 src/Util/Temporal.php:355
msgid "day" msgid "day"
msgstr "" msgstr ""
@ -5022,9 +5027,9 @@ msgstr ""
#: src/Module/Admin/Summary.php:98 #: src/Module/Admin/Summary.php:98
msgid "" msgid ""
"The last update failed. Please run \"php bin/console.php dbstructure update" "The last update failed. Please run \"php bin/console.php dbstructure "
"\" from the command line and have a look at the errors that might appear. " "update\" from the command line and have a look at the errors that might "
"(Some of the errors are possibly inside the logfile.)" "appear. (Some of the errors are possibly inside the logfile.)"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:103 #: src/Module/Admin/Summary.php:103
@ -5178,8 +5183,8 @@ msgstr ""
#, php-format #, php-format
msgid "" msgid ""
"Show some informations regarding the needed information to operate the node " "Show some informations regarding the needed information to operate the node "
"according e.g. to <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer" "according e.g. to <a href=\"%s\" target=\"_blank\" rel=\"noopener "
"\">EU-GDPR</a>." "noreferrer\">EU-GDPR</a>."
msgstr "" msgstr ""
#: src/Module/Admin/Tos.php:81 #: src/Module/Admin/Tos.php:81
@ -8211,8 +8216,8 @@ msgstr ""
#: src/Module/Profile/Profile.php:158 #: src/Module/Profile/Profile.php:158
#, php-format #, php-format
msgid "" msgid ""
"You're currently viewing your profile as <b>%s</b> <a href=\"%s\" class=" "You're currently viewing your profile as <b>%s</b> <a href=\"%s\" "
"\"btn btn-sm pull-right\">Cancel</a>" "class=\"btn btn-sm pull-right\">Cancel</a>"
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:167 src/Module/Settings/Account.php:576 #: src/Module/Profile/Profile.php:167 src/Module/Settings/Account.php:576
@ -8231,17 +8236,17 @@ msgstr ""
msgid "j F" msgid "j F"
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:187 src/Util/Temporal.php:166 #: src/Module/Profile/Profile.php:187 src/Util/Temporal.php:168
msgid "Birthday:" msgid "Birthday:"
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:254 #: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:254
#: src/Util/Temporal.php:168 #: src/Util/Temporal.php:170
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:254 #: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:254
#: src/Util/Temporal.php:168 #: src/Util/Temporal.php:170
#, php-format #, php-format
msgid "%d year old" msgid "%d year old"
msgid_plural "%d years old" msgid_plural "%d years old"
@ -8779,8 +8784,8 @@ msgstr ""
#: src/Module/Security/TwoFactor/Verify.php:100 #: src/Module/Security/TwoFactor/Verify.php:100
#, php-format #, php-format
msgid "" msgid ""
"If you do not have access to your authentication code you can use a <a href=" "If you do not have access to your authentication code you can use a <a "
"\"%s\">two-factor recovery code</a>." "href=\"%s\">two-factor recovery code</a>."
msgstr "" msgstr ""
#: src/Module/Security/TwoFactor/Verify.php:101 #: src/Module/Security/TwoFactor/Verify.php:101
@ -9763,8 +9768,8 @@ msgstr ""
msgid "Location" msgid "Location"
msgstr "" msgstr ""
#: src/Module/Settings/Profile/Index.php:239 src/Util/Temporal.php:95 #: src/Module/Settings/Profile/Index.php:239 src/Util/Temporal.php:97
#: src/Util/Temporal.php:97 #: src/Util/Temporal.php:99
msgid "Miscellaneous" msgid "Miscellaneous"
msgstr "" msgstr ""
@ -10239,8 +10244,8 @@ msgstr ""
#: src/Module/Settings/TwoFactor/Verify.php:149 #: src/Module/Settings/TwoFactor/Verify.php:149
#, php-format #, php-format
msgid "" msgid ""
"<p>Or you can open the following URL in your mobile device:</p><p><a href=" "<p>Or you can open the following URL in your mobile device:</p><p><a "
"\"%s\">%s</a></p>" "href=\"%s\">%s</a></p>"
msgstr "" msgstr ""
#: src/Module/Settings/TwoFactor/Verify.php:156 #: src/Module/Settings/TwoFactor/Verify.php:156
@ -10312,9 +10317,9 @@ msgstr ""
msgid "" msgid ""
"At any point in time a logged in user can export their account data from the " "At any point in time a logged in user can export their account data from the "
"<a href=\"%1$s/settings/userexport\">account settings</a>. If the user wants " "<a href=\"%1$s/settings/userexport\">account settings</a>. If the user wants "
"to delete their account they can do so at <a href=\"%1$s/settings/removeme\">" "to delete their account they can do so at <a href=\"%1$s/settings/"
"%1$s/settings/removeme</a>. The deletion of the account will be permanent. " "removeme\">%1$s/settings/removeme</a>. The deletion of the account will be "
"Deletion of the data will also be requested from the nodes of the " "permanent. Deletion of the data will also be requested from the nodes of the "
"communication partners." "communication partners."
msgstr "" msgstr ""
@ -11305,73 +11310,73 @@ msgstr ""
msgid "thanks" msgid "thanks"
msgstr "" msgstr ""
#: src/Util/Temporal.php:170 #: src/Util/Temporal.php:172
msgid "YYYY-MM-DD or MM-DD" msgid "YYYY-MM-DD or MM-DD"
msgstr "" msgstr ""
#: src/Util/Temporal.php:278 #: src/Util/Temporal.php:280
#, php-format #, php-format
msgid "Time zone: <strong>%s</strong> <a href=\"%s\">Change in Settings</a>" msgid "Time zone: <strong>%s</strong> <a href=\"%s\">Change in Settings</a>"
msgstr "" msgstr ""
#: src/Util/Temporal.php:318 src/Util/Temporal.php:325 #: src/Util/Temporal.php:320 src/Util/Temporal.php:329
msgid "never" msgid "never"
msgstr "" msgstr ""
#: src/Util/Temporal.php:339 #: src/Util/Temporal.php:343
msgid "less than a second ago" msgid "less than a second ago"
msgstr "" msgstr ""
#: src/Util/Temporal.php:348 #: src/Util/Temporal.php:352
msgid "year" msgid "year"
msgstr "" msgstr ""
#: src/Util/Temporal.php:348 #: src/Util/Temporal.php:352
msgid "years" msgid "years"
msgstr "" msgstr ""
#: src/Util/Temporal.php:349 #: src/Util/Temporal.php:353
msgid "months" msgid "months"
msgstr "" msgstr ""
#: src/Util/Temporal.php:350 #: src/Util/Temporal.php:354
msgid "weeks" msgid "weeks"
msgstr "" msgstr ""
#: src/Util/Temporal.php:351 #: src/Util/Temporal.php:355
msgid "days" msgid "days"
msgstr "" msgstr ""
#: src/Util/Temporal.php:352 #: src/Util/Temporal.php:356
msgid "hour" msgid "hour"
msgstr "" msgstr ""
#: src/Util/Temporal.php:352 #: src/Util/Temporal.php:356
msgid "hours" msgid "hours"
msgstr "" msgstr ""
#: src/Util/Temporal.php:353 #: src/Util/Temporal.php:357
msgid "minute" msgid "minute"
msgstr "" msgstr ""
#: src/Util/Temporal.php:353 #: src/Util/Temporal.php:357
msgid "minutes" msgid "minutes"
msgstr "" msgstr ""
#: src/Util/Temporal.php:354 #: src/Util/Temporal.php:358
msgid "second" msgid "second"
msgstr "" msgstr ""
#: src/Util/Temporal.php:354 #: src/Util/Temporal.php:358
msgid "seconds" msgid "seconds"
msgstr "" msgstr ""
#: src/Util/Temporal.php:364 #: src/Util/Temporal.php:367
#, php-format #, php-format
msgid "in %1$d %2$s" msgid "in %1$d %2$s"
msgstr "" msgstr ""
#: src/Util/Temporal.php:367 #: src/Util/Temporal.php:370
#, php-format #, php-format
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""