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

Merge pull request #11095 from MrPetovan/task/11089-delegation-redirect 

Change redirect page after delegation switch
This commit is contained in:
Philipp 2021-12-12 20:13:16 +01:00 committed by GitHub
parent f4907a48d8 b0b5a6c6f2
commit 36329f9e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Module/Delegation.php
View File

@ -108,8 +108,9 @@ class Delegation extends BaseModule
$ret = []; $ret = [];
Hook::callAll('home_init', $ret); Hook::callAll('home_init', $ret);
DI::baseUrl()->redirect('profile/' . DI::app()->getLoggedInUserNickname()); notice($this->t('You are now logged in as %s', $user['username']));
// NOTREACHED
DI::baseUrl()->redirect('network');
} }
protected function content(array $request = []): string protected function content(array $request = []): string

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.12-rc\n" "Project-Id-Version: 2021.12-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-08 13:36+0000\n" "POT-Creation-Date: 2021-12-12 07:58-0500\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"
@ -128,7 +128,7 @@ msgstr ""
#: mod/wallmessage.php:37 mod/wallmessage.php:56 mod/wallmessage.php:90 #: mod/wallmessage.php:37 mod/wallmessage.php:56 mod/wallmessage.php:90
#: mod/wallmessage.php:110 src/Module/Attach.php:55 src/Module/BaseApi.php:92 #: mod/wallmessage.php:110 src/Module/Attach.php:55 src/Module/BaseApi.php:92
#: src/Module/BaseNotifications.php:97 src/Module/Contact/Advanced.php:60 #: src/Module/BaseNotifications.php:97 src/Module/Contact/Advanced.php:60
#: src/Module/Delegation.php:118 src/Module/FollowConfirm.php:18 #: src/Module/Delegation.php:119 src/Module/FollowConfirm.php:18
#: src/Module/FriendSuggest.php:56 src/Module/Group.php:42 #: src/Module/FriendSuggest.php:56 src/Module/Group.php:42
#: src/Module/Group.php:85 src/Module/Invite.php:41 src/Module/Invite.php:130 #: src/Module/Group.php:85 src/Module/Invite.php:41 src/Module/Invite.php:130
#: src/Module/Notifications/Notification.php:48 #: src/Module/Notifications/Notification.php:48
@ -407,7 +407,7 @@ msgstr ""
#: src/Module/Debug/ActivityPubConversion.php:141 #: src/Module/Debug/ActivityPubConversion.php:141
#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64 #: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
#: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51 #: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51
#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:144 #: src/Module/Delegation.php:148 src/Module/FriendSuggest.php:144
#: src/Module/Install.php:252 src/Module/Install.php:294 #: src/Module/Install.php:252 src/Module/Install.php:294
#: src/Module/Install.php:331 src/Module/Invite.php:177 #: src/Module/Install.php:331 src/Module/Invite.php:177
#: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247 #: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247
@ -2127,16 +2127,16 @@ msgstr ""
msgid "toggle mobile" msgid "toggle mobile"
msgstr "" msgstr ""
#: src/App/Router.php:276 #: src/App/Router.php:286
#, 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:278 src/Module/HTTPException/PageNotFound.php:33 #: src/App/Router.php:288 src/Module/HTTPException/PageNotFound.php:33
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
#: src/App/Router.php:305 #: src/App/Router.php:315
msgid "You must be logged in to use addons. " msgid "You must be logged in to use addons. "
msgstr "" msgstr ""
@ -7903,21 +7903,26 @@ msgstr ""
msgid "Lookup address:" msgid "Lookup address:"
msgstr "" msgstr ""
#: src/Module/Delegation.php:142 #: src/Module/Delegation.php:111
msgid "Switch between your accounts" #, php-format
msgid "You are now logged in as %s"
msgstr "" msgstr ""
#: src/Module/Delegation.php:143 #: src/Module/Delegation.php:143
msgid "Manage your accounts" msgid "Switch between your accounts"
msgstr "" msgstr ""
#: src/Module/Delegation.php:144 #: src/Module/Delegation.php:144
msgid "Manage your accounts"
msgstr ""
#: src/Module/Delegation.php:145
msgid "" msgid ""
"Toggle between different identities or community/group pages which share " "Toggle between different identities or community/group pages which share "
"your account details or which you have been granted \"manage\" permissions" "your account details or which you have been granted \"manage\" permissions"
msgstr "" msgstr ""
#: src/Module/Delegation.php:145 #: src/Module/Delegation.php:146
msgid "Select an identity to manage: " msgid "Select an identity to manage: "
msgstr "" msgstr ""