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

merged 4 commits into from
Sep 28, 2018

Conversation

hmhealey
Copy link
Member

Ticket Link

https://mattermost.atlassian.net/browse/MM-11954

Checklist

  • Has UI changes
  • Includes text changes and localization file (.../i18n/en.json) updates

@hmhealey hmhealey added the 2: Dev Review Requires review by a core commiter label Sep 25, 2018
@hmhealey hmhealey added this to the v5.4.0 milestone Sep 25, 2018
@@ -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

@esethna esethna added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Sep 27, 2018
@cpanato cpanato merged commit 1f3d797 into master Sep 28, 2018
@cpanato cpanato deleted the mm11954 branch September 28, 2018 13:47
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Sep 28, 2018
@lindy65 lindy65 added Tests/Not Needed Does not require new release tests and removed 4: Reviews Complete All reviewers have approved the pull request labels Sep 30, 2018
danmaas added a commit to coreplane/mattermost-webapp that referenced this pull request Oct 1, 2018
…pdate-20180922

* commit 'cad0dc08c2b595c3668f829bd390aca5ddf690ff': (33 commits)
  comment typo (mattermost#1805)
  MM-12283 Add loader for more_channels modal (mattermost#1798)
  MM-12221: Pass channel and channel member to onClick handler for mobile channel header plugins. (mattermost#1728)
  Fixing scroll jumping for pinned and flagged posts. (mattermost#1795)
  MM-12257 preserve extra on logout (mattermost#1784)
  MM-12217 - Updating autocomplete css (mattermost#1790)
  Adding paging for elasticsearch results. (mattermost#1759)
  MM-12265 - Updating sidebar item css (mattermost#1792)
  MM-12351 - Updating default webhooks (mattermost#1791)
  remove one of two tooltips of unmute icon and replace with aria-label (mattermost#1779)
  Remove the reply bar in RHS (mattermost#1789)
  Accept direct values on isDissabled and isHidden (mattermost#1787)
  MM-12149 - Updating border for webhook images (mattermost#1786)
  Fix autocomplete staying open when deleting mention character at beginning of textbox (mattermost#1778)
  MM-12308 - Updating search popover styling (mattermost#1793)
  MM-11954 Simplify "User's message" translation (mattermost#1773)
  MM-12241 - Updating help text on DM Modal (mattermost#1788)
  MM-12130: Create a new page for displaying terms of service (mattermost#1735)
  [MM-4712] Add progress  bar for uploads (mattermost#1713)
  MM-12205: notify on session expiration (mattermost#1751)
  ...
fincha pushed a commit to fincha/mattermost-webapp that referenced this pull request Oct 21, 2018
* MM-11954 Simplify "User's message" translation

* Fix default message and update snapshots

* Update snapshots
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Tests/Not Needed Does not require new release tests
Projects
None yet
7 participants