IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
hmhealey
2016-03-02 12:08:55 -05:00
committed by Harrison Healey
parent a92b51935e
commit 366bc4fd57
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/react/components/filtered_user_list.jsx
View File

@@ -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
}}
/>

4
web/static/i18n/en.json
View File

@@ -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",

4
web/static/i18n/es.json
View File

@@ -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",

4
web/static/i18n/pt.json
View File

@@ -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",