mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-07 12:34:39 +02:00
Merge 155370bc2e into fce04bfa5c
This commit is contained in:
Marcus
GitHub
commit
f9678b0de1
8 changed files with 36 additions and 37 deletions
|
|
@ -447,7 +447,7 @@ abstract class BaseModule implements ICanHandleRequests
|
|||
'sel' => $current == 'following' ? 'active' : '',
|
||||
],
|
||||
[
|
||||
'label' => DI::l10n()->t('Mutual friends'),
|
||||
'label' => DI::l10n()->t('Friends'),
|
||||
'url' => $baseUrl . '/contacts/mutuals',
|
||||
'sel' => $current == 'mutuals' ? 'active' : '',
|
||||
],
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ class Conversation
|
|||
|
||||
//jot nav tab (used in some themes)
|
||||
'$message' => $this->l10n->t('Message'),
|
||||
'$browser' => $this->l10n->t('Browser'),
|
||||
'$browser' => $this->l10n->t('Add media'),
|
||||
|
||||
'$compose_link_title' => $this->l10n->t('Open Compose page'),
|
||||
'$always_open_compose' => $this->pConfig->get($this->session->getLocalUserId(), 'frio', 'always_open_compose', false),
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ class Widget
|
|||
$options = [
|
||||
['ref' => 'followers', 'name' => DI::l10n()->t('Followers')],
|
||||
['ref' => 'following', 'name' => DI::l10n()->t('Following')],
|
||||
['ref' => 'mutuals', 'name' => DI::l10n()->t('Mutual friends')],
|
||||
['ref' => 'mutuals', 'name' => DI::l10n()->t('Friends')],
|
||||
['ref' => 'nothing', 'name' => DI::l10n()->t('No relationship')],
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ class Contact extends BaseModule
|
|||
$header = DI::l10n()->t('Following');
|
||||
break;
|
||||
case 'mutuals':
|
||||
$header = DI::l10n()->t('Mutual friends');
|
||||
$header = DI::l10n()->t('Friends');
|
||||
break;
|
||||
case 'nothing':
|
||||
$header = DI::l10n()->t('No relationship');
|
||||
|
|
@ -565,15 +565,15 @@ class Contact extends BaseModule
|
|||
if (!empty($contact['uid']) && !empty($contact['rel']) && DI::userSession()->getLocalUserId() == $contact['uid']) {
|
||||
switch ($contact['rel']) {
|
||||
case Model\Contact::FRIEND:
|
||||
$alt_text = DI::l10n()->t('Mutual Friendship');
|
||||
$alt_text = DI::l10n()->t('Friend');
|
||||
break;
|
||||
|
||||
case Model\Contact::FOLLOWER:
|
||||
$alt_text = DI::l10n()->t('is a fan of yours');
|
||||
$alt_text = DI::l10n()->t('Follows you');
|
||||
break;
|
||||
|
||||
case Model\Contact::SHARING:
|
||||
$alt_text = DI::l10n()->t('you are a fan of');
|
||||
$alt_text = DI::l10n()->t('You follow');
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ class Edit extends BaseModule
|
|||
|
||||
//jot nav tab (used in some themes)
|
||||
'$message' => $this->t('Message'),
|
||||
'$browser' => $this->t('Browser'),
|
||||
'$browser' => $this->t('Add media'),
|
||||
'$shortpermset' => $this->t('Permissions'),
|
||||
|
||||
'$compose_link_title' => $this->t('Open Compose page'),
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
},
|
||||
|
|
@ -126,7 +126,7 @@ class Contacts extends Module\BaseProfile
|
|||
$title = $this->tt('Following (%s)', 'Following (%s)', $total);
|
||||
break;
|
||||
case 'mutuals':
|
||||
$title = $this->tt('Mutual friend (%s)', 'Mutual friends (%s)', $total);
|
||||
$title = $this->tt('Friend (%s)', 'Friends (%s)', $total);
|
||||
$desc = $this->t(
|
||||
'These contacts both follow and are followed by <strong>%s</strong>.',
|
||||
htmlentities($profile['name'], ENT_COMPAT, 'UTF-8')
|
||||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ class Profile extends BaseProfile
|
|||
|
||||
$basic_fields = [];
|
||||
|
||||
$basic_fields += self::buildField('fullname', $this->t('Full Name:'), $this->cleanInput($profile['uri-id'], $profile['name']));
|
||||
$basic_fields += self::buildField('fullname', $this->t('Display name:'), $this->cleanInput($profile['uri-id'], $profile['name']));
|
||||
|
||||
if (Feature::isEnabled($profile['uid'], Feature::MEMBER_SINCE)) {
|
||||
$basic_fields += self::buildField(
|
||||
|
|
|
|||
|
|
@ -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 <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\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 <b>%s</b> <a href=\"%s\" class=\"btn btn-sm pull-right\">Cancel</a>"
|
||||
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 ""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue