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/file_upload.jsx         | 6 +++++-
 web/react/components/rhs_comment.jsx         | 2 +-
 web/react/components/rhs_root_post.jsx       | 2 +-
 web/react/components/search_results_item.jsx | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index 2f9146193..626dbc5b3 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -20,6 +20,10 @@ const holders = defineMessages({
     fileAbove: {
         id: 'file_upload.fileAbove',
         defaultMessage: 'File above {max}MB could not be uploaded: {filename}'
+    },
+    pasted: {
+        id: 'file_upload.pasted',
+        defaultMessage: 'Image Pasted at '
     }
 });
 
@@ -237,7 +241,7 @@ class FileUpload extends React.Component {
                             min = String(d.getMinutes());
                         }
 
-                        var name = 'Image Pasted at ' + d.getFullYear() + '-' + d.getMonth() + '-' + d.getDate() + ' ' + hour + '-' + min + '.' + ext;
+                        var name = formatMessage(holders.pasted) + d.getFullYear() + '-' + d.getMonth() + '-' + d.getDate() + ' ' + hour + '-' + min + '.' + ext;
                         formData.append('files', file, name);
                         formData.append('client_ids', clientId);
 
diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx
index 1dd8354d7..1addebbe4 100644
--- a/web/react/components/rhs_comment.jsx
+++ b/web/react/components/rhs_comment.jsx
@@ -231,7 +231,7 @@ class RhsComment extends React.Component {
                                         day='numeric'
                                         month='long'
                                         year='numeric'
-                                        hour12='true'
+                                        hour12={true}
                                         hour='2-digit'
                                         minute='2-digit'
                                     />
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'
                                     />
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index a0b252d25..0ad091d5b 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -81,7 +81,7 @@ export default class SearchResultsItem 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