diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php index d3253a19e0..6d32528aba 100644 --- a/src/Module/Profile/Contacts.php +++ b/src/Module/Profile/Contacts.php @@ -107,7 +107,7 @@ class Contacts extends Module\BaseProfile $contact = Model\Contact::selectFirst( [], ['uri-id' => $contact['uri-id'], 'uid' => [0, $this->userSession->getLocalUserId()]], - ['order' => ['uid' => 'DESC']] + ['order' => ['uid' => 'DESC']] ); return $contact ? Module\Contact::getContactTemplateVars($contact) : null; }, @@ -139,7 +139,7 @@ class Contacts extends Module\BaseProfile } $tpl = Renderer::getMarkupTemplate('profile/contacts.tpl'); - $o .= Renderer::replaceMacros($tpl, [ + $o .= Renderer::replaceMacros($tpl, [ '$title' => $title, '$desc' => $desc, '$tabs' => $tabs, diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 6b0e5e433d..c84a97d4f8 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2025.02-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-06-03 20:17+0200\n" +"POT-Creation-Date: 2025-06-04 15:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -791,8 +791,9 @@ msgstr "" msgid "Following" msgstr "" -#: src/BaseModule.php:450 src/Content/Widget.php:259 src/Module/Contact.php:402 -msgid "Mutual friends" +#: src/BaseModule.php:450 src/Content/Widget.php:259 src/Model/User.php:1383 +#: src/Module/Contact.php:402 +msgid "Friends" msgstr "" #: src/BaseModule.php:458 @@ -1372,8 +1373,7 @@ msgid "Message" msgstr "" #: src/Content/Conversation.php:418 src/Module/Post/Edit.php:178 -#: src/Module/Settings/TwoFactor/Trusted.php:129 -msgid "Browser" +msgid "Add media" msgstr "" #: src/Content/Conversation.php:420 src/Module/Post/Edit.php:181 @@ -3741,10 +3741,6 @@ msgstr "" msgid "An error occurred creating your self contact. Please try again." msgstr "" -#: src/Model/User.php:1383 -msgid "Friends" -msgstr "" - #: src/Model/User.php:1387 msgid "An error occurred creating your default contact circle. Please try again." msgstr "" @@ -6156,16 +6152,16 @@ msgstr "" msgid "Advanced Contact Settings" msgstr "" -#: src/Module/Contact.php:568 -msgid "Mutual Friendship" +#: src/Module/Contact.php:568 src/Module/Notifications/Introductions.php:148 +msgid "Friend" msgstr "" #: src/Module/Contact.php:572 -msgid "is a fan of yours" +msgid "Follows you" msgstr "" #: src/Module/Contact.php:576 -msgid "you are a fan of" +msgid "You follow" msgstr "" #: src/Module/Contact.php:594 @@ -6240,7 +6236,7 @@ msgid_plural "Following (%s)" msgstr[0] "" msgstr[1] "" -#: src/Module/Contact/Contacts.php:109 src/Module/Profile/Contacts.php:129 +#: src/Module/Contact/Contacts.php:109 #, php-format msgid "Mutual friend (%s)" msgid_plural "Mutual friends (%s)" @@ -8326,10 +8322,6 @@ msgstr "" msgid "Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed." msgstr "" -#: src/Module/Notifications/Introductions.php:148 -msgid "Friend" -msgstr "" - #: src/Module/Notifications/Introductions.php:149 msgid "Subscriber" msgstr "" @@ -8571,6 +8563,13 @@ msgstr "" msgid "%d more" msgstr "" +#: src/Module/Profile/Contacts.php:129 +#, php-format +msgid "Friend (%s)" +msgid_plural "Friends (%s)" +msgstr[0] "" +msgstr[1] "" + #: src/Module/Profile/Contacts.php:147 msgid "No contacts." msgstr "" @@ -8629,8 +8628,9 @@ msgstr "" msgid "You're currently viewing your profile as %s Cancel" msgstr "" -#: src/Module/Profile/Profile.php:176 -msgid "Full Name:" +#: src/Module/Profile/Profile.php:176 src/Module/Settings/Account.php:522 +#: src/Module/Settings/Profile/Index.php:299 +msgid "Display name:" msgstr "" #: src/Module/Profile/Profile.php:181 @@ -9259,11 +9259,6 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: src/Module/Settings/Account.php:522 -#: src/Module/Settings/Profile/Index.php:299 -msgid "Display name:" -msgstr "" - #: src/Module/Settings/Account.php:523 msgid "Email Address:" msgstr "" @@ -10660,6 +10655,10 @@ msgstr "" msgid "OS" msgstr "" +#: src/Module/Settings/TwoFactor/Trusted.php:129 +msgid "Browser" +msgstr "" + #: src/Module/Settings/TwoFactor/Trusted.php:130 msgid "Trusted" msgstr ""