From a648a579cc9db04ccdd70d82695253e76642fb0d Mon Sep 17 00:00:00 2001
From: Manfred Hoffmann <48651533+manne65-hd@users.noreply.github.com>
Date: Sun, 5 Apr 2020 23:55:25 +0200
Subject: [PATCH] Final fixes / German translation for user-groups-listing

---
 app/Helper/UserHelper.php               | 2 +-
 app/Locale/de_DE/translations.php       | 2 +-
 app/Template/user_list/user_details.php | 4 ++--
 app/Template/user_view/show.php         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Helper/UserHelper.php b/app/Helper/UserHelper.php
index 85d9335bc..eaf431902 100644
--- a/app/Helper/UserHelper.php
+++ b/app/Helper/UserHelper.php
@@ -131,7 +131,7 @@ class UserHelper extends Base
             'limited_list' => $limitedList,
             'has_groups' => $total > 0,
             'total' => $total,
-            'not_shown' => $total - count($limitedList),
+            'shown' => count($limitedList),
         ];
     }
 
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 2977c5ae9..f2d5193ff 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -1418,7 +1418,7 @@ return array(
     'Enable global tags for this project' => 'Globale Schlagworte für dieses Projekt aktivieren',
     'Group membership(s):' => 'Gruppen-Mitgliedschaft(en):',
     '%s is a member of the following group(s): %s' => '%s ist Mitglied in der/den folgenden Gruppe(n): %s',
-    // '%d/%d group(s) shown' => '',
+    '%d/%d group(s) shown' => '%d/%d Gruppe(n) angezeigt',
     'Group membership(s):' => 'Gruppen Mitgliedschaft(en)',
     'Subtask creation or modification' => 'Teilaufgabe erstellen oder ändern',
 );
diff --git a/app/Template/user_list/user_details.php b/app/Template/user_list/user_details.php
index cbc7f929f..737a6a86f 100644
--- a/app/Template/user_list/user_details.php
+++ b/app/Template/user_list/user_details.php
@@ -17,8 +17,8 @@
         <?php if ($users_groups['has_groups']): ?>
             <span title="<?= $groups_list_tooltip ?>">
                 <i class="fa fa-fw fa-group" aria-hidden="true"></i><?= $this->text->implode(', ', $users_groups['limited_list']) ?>
-                <?php if ($users_groups['not_shown'] > 0): ?>
-                    ‑&nbsp;<?= t('%d/%d group(s) shown', $users_groups['not_shown'], $users_groups['total']) ?>
+                <?php if ($users_groups['shown'] != $users_groups['total']): ?>
+                    ‑&nbsp;<?= t('%d/%d group(s) shown', $users_groups['shown'], $users_groups['total']) ?>
                 <?php endif ?>
             </span>
         <?php endif ?>
diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php
index 759449ec8..1c4b5f996 100644
--- a/app/Template/user_view/show.php
+++ b/app/Template/user_view/show.php
@@ -14,7 +14,7 @@
 </div>
 <ul class="panel">
     <li><?= t('Role:') ?> <strong><?= $this->user->getRoleName($user['role']) ?></strong></li>
-    <li><?= t('Group membership(s):') ?> <strong><?= $this->user->getUsersGroupNames($user['id'])['full_list'] ?></strong></li>
+    <li><?= t('Group membership(s):') ?> <strong><?= implode(', ', $this->user->getUsersGroupNames($user['id'])['full_list']) ?></strong></li>
     <li><?= t('Account type:') ?> <strong><?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?></strong></li>
     <li><?= $user['twofactor_activated'] == 1 ? t('Two factor authentication enabled') :  t('Two factor authentication disabled') ?></li>
     <li><?= t('Number of failed login:') ?> <strong><?= $user['nb_failed_login'] ?></strong></li>