From: Michael <heluecht@pirati.ca>
Date: Mon, 9 Aug 2021 15:32:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into app-user2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4495e83eca67986ecbd5e083509c782116d77c6c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into app-user2
---

4495e83eca67986ecbd5e083509c782116d77c6c
diff --cc src/Module/Settings/Profile/Index.php
index dbcb7fb06a,4f4ddbdb3e..042ff66c2b
--- a/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@@ -238,8 -243,9 +240,9 @@@ class Index extends BaseSetting
  			'$region' => ['region', DI::l10n()->t('Region/State:'), $profile['region']],
  			'$postal_code' => ['postal_code', DI::l10n()->t('Postal/Zip Code:'), $profile['postal-code']],
  			'$country_name' => ['country_name', DI::l10n()->t('Country:'), $profile['country-name']],
 -			'$age' => ((intval($profile['dob'])) ? '(' . DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($profile['dob'], $a->user['timezone'])) . ')' : ''),
 -			'$xmpp' => ['xmpp', DI::l10n()->t('XMPP (Jabber) address:'), $profile['xmpp'], DI::l10n()->t('The XMPP address will be published so that people can follow you there.')],
 +			'$age' => ((intval($profile['dob'])) ? '(' . DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($profile['dob'], $profile['timezone'])) . ')' : ''),
 +			'$xmpp' => ['xmpp', DI::l10n()->t('XMPP (Jabber) address:'), $profile['xmpp'], DI::l10n()->t('The XMPP address will be propagated to your contacts so that they can follow you.')],
+ 			'$matrix' => ['matrix', DI::l10n()->t('Matrix (Element) address:'), $profile['matrix'], DI::l10n()->t('The Matrix address will be published so that people can follow you there.')],
  			'$homepage' => ['homepage', DI::l10n()->t('Homepage URL:'), $profile['homepage']],
  			'$pub_keywords' => ['pub_keywords', DI::l10n()->t('Public Keywords:'), $profile['pub_keywords'], DI::l10n()->t('(Used for suggesting potential friends, can be seen by others)')],
  			'$prv_keywords' => ['prv_keywords', DI::l10n()->t('Private Keywords:'), $profile['prv_keywords'], DI::l10n()->t('(Used for searching profiles, never shown to others)')],