From: Michael <heluecht@pirati.ca>
Date: Sat, 19 Mar 2022 11:21:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into fetch-usage
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e45987f74ccbe61a53c711317c2e45894435ece;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into fetch-usage
---

4e45987f74ccbe61a53c711317c2e45894435ece
diff --cc src/Module/Admin/Federation.php
index 1d87b81dd0,79ae084576..bf49de8250
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@@ -164,14 -164,14 +164,14 @@@ class Federation extends BaseAdmi
  			}
  
  			$gserver['platform']    = $systems[$platform]['name'];
- 			$gserver['totallbl']    = DI::l10n()->t('%d total systems', $gserver['total']);
- 			$gserver['monthlbl']    = DI::l10n()->t('%d active users last month', $gserver['month']);
- 			$gserver['halfyearlbl'] = DI::l10n()->t('%d active users last six months', $gserver['halfyear']);
- 			$gserver['userslbl']    = DI::l10n()->t('%d registered users', $gserver['users']);
- 			$gserver['postslbl']    = DI::l10n()->t('%d locally created posts and comments', $gserver['posts']);
+ 			$gserver['totallbl']    = DI::l10n()->t('%s total systems', number_format($gserver['total']));
+ 			$gserver['monthlbl']    = DI::l10n()->t('%s active users last month', number_format($gserver['month']));
 -			$gserver['halfyearlbl'] = DI::l10n()->t('%s active users last six month', number_format($gserver['halfyear']));
++			$gserver['halfyearlbl'] = DI::l10n()->t('%s active users last six months', number_format($gserver['halfyear']));
+ 			$gserver['userslbl']    = DI::l10n()->t('%s registered users', number_format($gserver['users']));
 -			$gserver['postslbl']    = DI::l10n()->t('%s local posts', number_format($gserver['posts']));
++			$gserver['postslbl']    = DI::l10n()->t('%s locally created posts and comments', number_format($gserver['posts']));
  
  			if (($gserver['users'] > 0) && ($gserver['posts'] > 0)) {
- 				$gserver['postsuserlbl'] = DI::l10n()->t('%d posts per user', $gserver['posts'] / $gserver['users']);
+ 				$gserver['postsuserlbl'] = DI::l10n()->t('%s posts per user', number_format($gserver['posts'] / $gserver['users'], 1));
  			} else {
  				$gserver['postsuserlbl'] = '';
  			}
@@@ -196,7 -196,7 +196,7 @@@
  			'$intro' => $intro,
  			'$counts' => $counts,
  			'$version' => FRIENDICA_VERSION,
- 			'$legendtext' => DI::l10n()->t('Currently this node is aware of %d nodes (%d active users last month, %d active users last six months, %d registered users in total) from the following platforms:', $total, $month, $halfyear, $users),
 -			'$legendtext' => DI::l10n()->t('Currently this node is aware of %s nodes (%s active users last month, %s active users last six month, %s registered users in total) from the following platforms:', number_format($total), number_format($month), number_format($halfyear), number_format($users)),
++			'$legendtext' => DI::l10n()->t('Currently this node is aware of %d nodes (%d active users last month, %d active users last six months, %d registered users in total) from the following platforms:', number_format($total), number_format($month), number_format($halfyear), number_format($users)),
  		]);
  	}
  
diff --cc view/lang/C/messages.po
index 2d1a09cfa2,a67e3cba70..09fbca0489
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 2022.05-dev\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2022-02-07 06:53+0000\n"
++=======
+ "POT-Creation-Date: 2022-03-16 06:27+0100\n"
++>>>>>>> upstream/develop
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -5129,7 -5124,7 +5128,11 @@@ msgstr "
  
  #: src/Module/Admin/Federation.php:169
  #, php-format
++<<<<<<< HEAD
 +msgid "%d active users last six months"
++=======
+ msgid "%s active users last six month"
++>>>>>>> upstream/develop
  msgstr ""
  
  #: src/Module/Admin/Federation.php:170
@@@ -5139,7 -5134,7 +5142,11 @@@ msgstr "
  
  #: src/Module/Admin/Federation.php:171
  #, php-format
++<<<<<<< HEAD
 +msgid "%d locally created posts and comments"
++=======
+ msgid "%s local posts"
++>>>>>>> upstream/develop
  msgstr ""
  
  #: src/Module/Admin/Federation.php:174
@@@ -5166,8 -5161,8 +5173,13 @@@ msgstr "
  #: src/Module/Admin/Federation.php:199
  #, php-format
  msgid ""
++<<<<<<< HEAD
 +"Currently this node is aware of %d nodes (%d active users last month, %d "
 +"active users last six months, %d registered users in total) from the "
++=======
+ "Currently this node is aware of %s nodes (%s active users last month, %s "
+ "active users last six month, %s registered users in total) from the "
++>>>>>>> upstream/develop
  "following platforms:"
  msgstr ""