From 3f91bc2df2c6f9d8437f258233609e9801b7f8f6 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 1 Feb 2016 17:23:45 -0300
Subject: PLT-7: Refactoring frontend (chunk 9) - sidebar right & rhs

---
 web/react/components/rhs_root_post.jsx | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'web/react/components/rhs_root_post.jsx')

diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index cd7f6766c..bc772aaa5 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -14,6 +14,8 @@ import * as EventHelpers from '../dispatcher/event_helpers.jsx';
 
 import Constants from '../utils/constants.jsx';
 
+import {FormattedMessage, FormattedDate} from 'mm-intl';
+
 export default class RhsRootPost extends React.Component {
     constructor(props) {
         super(props);
@@ -68,7 +70,12 @@ export default class RhsRootPost extends React.Component {
         var channelName;
         if (channel) {
             if (channel.type === 'D') {
-                channelName = 'Direct Message';
+                channelName = (
+                    <FormattedMessage
+                        id='rhs_root.direct'
+                        defaultMessage='Direct Message'
+                    />
+                );
             } else {
                 channelName = channel.display_name;
             }
@@ -93,7 +100,10 @@ export default class RhsRootPost extends React.Component {
                         data-postid={post.id}
                         data-channelid={post.channel_id}
                     >
-                        {'Edit'}
+                        <FormattedMessage
+                            id='rhs_root.edit'
+                            defaultMessage='Edit'
+                        />
                     </a>
                 </li>
             );
@@ -110,7 +120,10 @@ export default class RhsRootPost extends React.Component {
                         role='menuitem'
                         onClick={() => EventHelpers.showDeletePostModal(post, this.props.commentCount)}
                     >
-                        {'Delete'}
+                        <FormattedMessage
+                            id='rhs_root.del'
+                            defaultMessage='Delete'
+                        />
                     </a>
                 </li>
             );
@@ -205,7 +218,15 @@ export default class RhsRootPost extends React.Component {
                             {botIndicator}
                             <li className='col'>
                                 <time className='post__time'>
-                                    {utils.displayCommentDateTime(post.create_at)}
+                                    <FormattedDate
+                                        value={post.create_at}
+                                        day='numeric'
+                                        month='long'
+                                        year='numeric'
+                                        hour12='true'
+                                        hour='2-digit'
+                                        minute='2-digit'
+                                    />
                                 </time>
                             </li>
                             <li className='col col__reply'>
-- 
cgit v1.2.3-1-g7c22


From e7f409a3c7a92d50cf857b808b61f4d5aadea8c3 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 1 Feb 2016 17:52:43 -0300
Subject: fix hour12 React warning for FormattedDate

---
 web/react/components/rhs_root_post.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/rhs_root_post.jsx')

diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index bc772aaa5..f9f7f8f81 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -223,7 +223,7 @@ export default class RhsRootPost extends React.Component {
                                         day='numeric'
                                         month='long'
                                         year='numeric'
-                                        hour12='true'
+                                        hour12={true}
                                         hour='2-digit'
                                         minute='2-digit'
                                     />
-- 
cgit v1.2.3-1-g7c22

