Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of 'member'

4 files changed, 15 insertions, 16 deletions

diff --git a/web/react/components/filtered_user_list.jsx b/web/react/components/filtered_user_list.jsx
index 67e75af47..7099f99af 100644
--- a/web/react/components/filtered_user_list.jsx
+++ b/web/react/components/filtered_user_list.jsx
@@ -55,20 +55,17 @@ class FilteredUserList extends React.Component {
             });
         }
 
-        let memberString = formatMessage(holders.member);
-        if (users.length !== 1) {
-            memberString += 's';
-        }
-
         let count;
         if (users.length === this.props.users.length) {
             count = (
                 <FormattedMessage
                     id='filtered_user_list.count'
-                    defaultMessage='{count} {member}'
+                    defaultMessage='{count} {count, plural,
+                        one {member}
+                        other {members}
+                    }'
                     values={{
-                        count: users.length,
-                        member: memberString
+                        count: users.length
                     }}
                 />
             );
@@ -76,10 +73,12 @@ class FilteredUserList extends React.Component {
             count = (
                 <FormattedMessage
                     id='filtered_user_list.countTotal'
-                    defaultMessage='{count} {member} of {total} Total'
+                    defaultMessage='{count} {count, plural,
+                        one {member}
+                        other {members}
+                    } of {total} Total'
                     values={{
                         count: users.length,
-                        member: memberString,
                         total: this.props.users.length
                     }}
                 />
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 0057b3f9a..0f5aca0c8 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -666,8 +666,8 @@
   "file_upload.filesAbove": "Files above {max}MB could not be uploaded: {filenames}",
   "file_upload.limited": "Uploads limited to {count} files maximum. Please use additional posts for more files.",
   "file_upload.pasted": "Image Pasted at ",
-  "filtered_user_list.count": "{count} {member}",
-  "filtered_user_list.countTotal": "{count} {member} of {total} Total",
+  "filtered_user_list.count": "{count, number} {count, plural, one {member} other {members}}",
+  "filtered_user_list.countTotal": "{count, number} {count, plural, one {member} other {members}} of {total} Total",
   "filtered_user_list.member": "Member",
   "filtered_user_list.search": "Search members",
   "find_team.email": "Email",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 5b44b051e..10a389438 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -666,8 +666,8 @@
   "file_upload.filesAbove": "No se pueden subir archivos de más de {max}MB: {filenames}",
   "file_upload.limited": "Se pueden subir un máximo de {count} archivos. Por favor envía otros mensajes para adjuntar más archivos.",
   "file_upload.pasted": "Imagen Pegada el ",
-  "filtered_user_list.count": "{count} {member}",
-  "filtered_user_list.countTotal": "{count} {member} de {total} Total",
+  "filtered_user_list.count": "{count, number} {count, plural, one {Miembro} other {Miembros}}",
+  "filtered_user_list.countTotal": "{count, number} {count, plural, one {Miembro} other {Miembros}} de {total} Total",
   "filtered_user_list.member": "Miembro",
   "filtered_user_list.search": "Buscar miembros",
   "find_team.email": "Correo electrónico",
diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json
index 0ae0ddbe5..6c56526b3 100644
--- a/web/static/i18n/pt.json
+++ b/web/static/i18n/pt.json
@@ -666,8 +666,8 @@
   "file_upload.filesAbove": "Arquivos acima {max}MB não podem ser enviados: {filenames}",
   "file_upload.limited": "Limite máximo de uploads de {count} arquivos. Por favor use um post adicional para mais arquivos.",
   "file_upload.pasted": "Imagem Colada em ",
-  "filtered_user_list.count": "{count} {member}",
-  "filtered_user_list.countTotal": "{count} {member} de {total} Total",
+  "filtered_user_list.count": "{count, number} {count, plural, one {Mensagem} other {Mensagems}}",
+  "filtered_user_list.countTotal": "{count, number} {count, plural, one {Mensagem} other {Mensagems}} de {total} Total",
   "filtered_user_list.message": "Mensagem",
   "filtered_user_list.search": "Procurar membros",
   "find_team.email": "E-mail",