Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-11954 Simplify "User's message" translation #1773

Merged
merged 4 commits into from
Sep 28, 2018
Merged

MM-11954 Simplify "User's message" translation #1773

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2f20ae
MM-11954 Simplify "User's message" translation
hmhealey Sep 25, 2018
22e8efe
Fix default message and update snapshots
hmhealey Sep 25, 2018
d4e5bda
Merge branch 'master' into mm11954
hmhealey Sep 26, 2018
a2eebb7
Update snapshots
hmhealey Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
MM-11954 Simplify "User's message" translation
  • Loading branch information
@hmhealey
hmhealey committed Sep 25, 2018
commit c2f20ae313068f9a3ce1843685046c23851e6952
8 changes: 1 addition & 7 deletions components/post_view/commented_on/commented_on.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ export default class CommentedOn extends PureComponent {
username = post.props.override_username;
}

let apostrophe = '\'s';
if (username.slice(-1) === 's') {
apostrophe = '\'';
}

const name = (
<a
className='theme'
Expand All @@ -74,10 +69,9 @@ export default class CommentedOn extends PureComponent {
<span>
<FormattedMessage
id='post_body.commentedOn'
defaultMessage='Commented on {name}{apostrophe} message: '
defaultMessage='Commented on {name} message: '
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not match with the en.json.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right. I missed the {name}'s message the first time as well

values={{
name,
apostrophe,
}}
/>
<a
Expand Down
2 changes: 1 addition & 1 deletion i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,7 @@
"post_body.check_for_out_of_channel_mentions.message_last": "? They will have access to all message history.",
"post_body.check_for_out_of_channel_mentions.message.multiple": "were mentioned but they are not in the channel. Would you like to ",
"post_body.check_for_out_of_channel_mentions.message.one": "was mentioned but is not in the channel. Would you like to ",
"post_body.commentedOn": "Commented on {name}{apostrophe} message: ",
"post_body.commentedOn": "Commented on {name}'s message: ",
"post_body.deleted": "(message deleted)",
"post_body.plusMore": " plus {count, number} other {count, plural, one {file} other {files}}",
"post_delete.notPosted": "Comment could not be posted",
Expand Down