Merge branch 'master' into PLT-2115

1 files changed, 5 insertions, 8 deletions

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 70cf86748..2fa4cebfe 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -80,12 +80,10 @@ class PostBody extends React.Component {
                     username = parentPost.props.override_username;
                 }
 
-                if (global.window.mm_locale === 'en') {
-                    if (username.slice(-1) === 's') {
-                        apostrophe = '\'';
-                    } else {
-                        apostrophe = '\'s';
-                    }
+                if (username.slice(-1) === 's') {
+                    apostrophe = '\'';
+                } else {
+                    apostrophe = '\'s';
                 }
                 name = (
                     <a
@@ -215,8 +213,7 @@ PostBody.propTypes = {
     post: React.PropTypes.object.isRequired,
     parentPost: React.PropTypes.object,
     retryPost: React.PropTypes.func.isRequired,
-    handleCommentClick: React.PropTypes.func.isRequired,
-    hasProfiles: React.PropTypes.bool
+    handleCommentClick: React.PropTypes.func.isRequired
 };
 
 export default injectIntl(PostBody);