From 78314c7d4d1417fd42ab48cbe41d360f80915453 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Sat, 30 Jan 2016 18:10:04 -0300 Subject: PLT-7: Refactoring frontend (chunk 6) - User settings --- web/react/components/setting_picture.jsx | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'web/react/components/setting_picture.jsx') diff --git a/web/react/components/setting_picture.jsx b/web/react/components/setting_picture.jsx index e69412cca..70e0e6755 100644 --- a/web/react/components/setting_picture.jsx +++ b/web/react/components/setting_picture.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import {FormattedMessage} from 'mm-intl'; + export default class SettingPicture extends React.Component { constructor(props) { super(props); @@ -76,10 +78,24 @@ export default class SettingPicture extends React.Component { Save + > + + ); } - var helpText = 'Upload a profile picture in either JPG or PNG format, at least ' + global.window.mm_config.ProfileWidth + 'px in width and ' + global.window.mm_config.ProfileHeight + 'px height.'; + var helpText = ( + + ); var self = this; return ( @@ -97,7 +113,10 @@ export default class SettingPicture extends React.Component { {serverError} {clientError} - Select + Cancel + > + + -- cgit v1.2.3-1-g7c22