diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-05-02 14:09:08 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-05-02 11:09:08 -0700 |
commit | 2fb6c689b7291117e691d50f51fdda2451db9da3 (patch) | |
tree | dc3e7cba6f6681e69e828dd30246bd668f9551f1 /webapp | |
parent | e3f254c3be26aa05730afc46f5584bb595eea232 (diff) | |
download | chat-2fb6c689b7291117e691d50f51fdda2451db9da3.tar.gz chat-2fb6c689b7291117e691d50f51fdda2451db9da3.tar.bz2 chat-2fb6c689b7291117e691d50f51fdda2451db9da3.zip |
Fixing zero case for members modal. Removing :( (#2846)
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/filtered_user_list.jsx | 10 | ||||
-rw-r--r-- | webapp/i18n/en.json | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/webapp/components/filtered_user_list.jsx b/webapp/components/filtered_user_list.jsx index 5aa0bd96c..e12faa298 100644 --- a/webapp/components/filtered_user_list.jsx +++ b/webapp/components/filtered_user_list.jsx @@ -64,10 +64,7 @@ class FilteredUserList extends React.Component { count = ( <FormattedMessage id='filtered_user_list.count' - defaultMessage='{count} {count, plural, - one {member} - other {members} - }' + defaultMessage='{count} {count, plural, =0 {0 members} one {member} other {members}}' values={{ count: users.length }} @@ -77,10 +74,7 @@ class FilteredUserList extends React.Component { count = ( <FormattedMessage id='filtered_user_list.countTotal' - defaultMessage='{count} {count, plural, - one {member} - other {members} - } of {total} Total' + defaultMessage='{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total' values={{ count: users.length, total: this.props.users.length diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 6392d7d4e..78ff7d374 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -848,8 +848,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} {count, plural, one {member} other {members}}", - "filtered_user_list.countTotal": "{count} {count, plural, one {member} other {members}} of {total} Total", + "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}", + "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total", "filtered_user_list.member": "Member", "filtered_user_list.search": "Search members", "find_team.email": "Email", @@ -1409,7 +1409,7 @@ "user.settings.security.switchLdap": "Switch to using LDAP", "user.settings.security.title": "Security Settings", "user.settings.security.viewHistory": "View Access History", - "user_list.notFound": "No users found :(", + "user_list.notFound": "No users found", "user_profile.notShared": "Email not shared", "view_image.loading": "Loading ", "view_image_popover.download": "Download", |