From ac4e9909fa4f3f6c6a0d1e537d6039115d07a5e0 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 22 Jun 2017 06:30:03 -0400 Subject: Fixed incorrect formatting of numbers and plural words (#6696) * Fixed incorrect formatting of numbers and plural words * Removed unused i18n strings * Fixed eslint errors --- webapp/i18n/en.json | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'webapp/i18n') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index c43d03b53..fba6174e5 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1269,7 +1269,7 @@ "delete_post.del": "Delete", "delete_post.post": "Post", "delete_post.question": "Are you sure you want to delete this {term}?", - "delete_post.warning": "This post has {count} comment(s) on it.", + "delete_post.warning": "This post has {count, number} {count, plural, one {comment} other {comments}} on it.", "edit_channel_header.editHeader": "Edit the Channel Header...", "edit_channel_header.previewHeader": "Edit header", "edit_channel_header_modal.cancel": "Cancel", @@ -1350,16 +1350,13 @@ "file_upload.disabled": "File attachments are disabled.", "file_upload.fileAbove": "File above {max}MB cannot be uploaded: {filename}", "file_upload.filesAbove": "Files above {max}MB cannot be uploaded: {filenames}", - "file_upload.limited": "Uploads limited to {count} files maximum. Please use additional posts for more files.", + "file_upload.limited": "Uploads limited to {count, number} files maximum. Please use additional posts for more files.", "file_upload.pasted": "Image Pasted at ", - "filtered_channels_list.count": "{count} {count, plural, =0 {0 channels} one {channel} other {channels}}", - "filtered_channels_list.countTotal": "{count} {count, plural, =0 {0 channels} one {channel} other {channels}} of {total} total", "filtered_channels_list.search": "Search channels", "filtered_user_list.any_team": "All Users", - "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}", - "filtered_user_list.countPage": "{startCount, number} - {endCount, number} {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.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} 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, number} total", + "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, one {member} other {members}} of {total, number} total", "filtered_user_list.member": "Member", "filtered_user_list.next": "Next", "filtered_user_list.prev": "Previous", @@ -1803,7 +1800,7 @@ "multiselect.add": "Add", "multiselect.go": "Go", "multiselect.instructions": "Use up/down arrows to navigate and enter to select", - "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ", + "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, one {person} other {people}}. ", "multiselect.numRemaining": "You can add {num, number} more", "multiselect.placeholder": "Search and add members", "navbar.addMembers": "Add Members", @@ -1869,8 +1866,7 @@ "post_attachment.more": "Show more...", "post_body.commentedOn": "Commented on {name}{apostrophe} message: ", "post_body.deleted": "(message deleted)", - "post_body.plusMore": " plus {count} other files", - "post_body.plusOne": " plus 1 other file", + "post_body.plusMore": " plus {count, number} other {count, plural, one {file} other {files}}", "post_delete.notPosted": "Comment could not be posted", "post_delete.okay": "Okay", "post_delete.someone": "Someone deleted the message on which you tried to post a comment.", @@ -2074,8 +2070,8 @@ "suggestion.search.private": "Private Channels", "suggestion.search.public": "Public Channels", "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}", - "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total} total", - "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total} total", + "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total, number} total", + "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total, number} total", "team_export_tab.download": "download", "team_export_tab.export": "Export", "team_export_tab.exportTeam": "Export your team", @@ -2444,7 +2440,7 @@ "user_profile.webrtc.unavailable": "New call unavailable until your existing call ends", "view_image.loading": "Loading ", "view_image_popover.download": "Download", - "view_image_popover.file": "File {count} of {total}", + "view_image_popover.file": "File {count, number} of {total, number}", "view_image_popover.publicLink": "Get Public Link", "web.footer.about": "About", "web.footer.help": "Help", -- cgit v1.2.3-1-g7c22