From 17f10b1abad76d797e7c0b3b686f065a253f5c0b Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 29 Mar 2016 10:46:54 -0400
Subject: Added english localization for Backstage and additional cleanup

---
 webapp/components/backstage/add_incoming_webhook.jsx | 14 +++++++-------
 webapp/components/backstage/add_integration.jsx      |  2 +-
 webapp/components/backstage/add_outgoing_webhook.jsx | 20 ++++++++++----------
 webapp/components/backstage/backstage_navbar.jsx     |  3 +--
 webapp/components/backstage/backstage_sidebar.jsx    | 10 +++++-----
 5 files changed, 24 insertions(+), 25 deletions(-)

(limited to 'webapp/components/backstage')

diff --git a/webapp/components/backstage/add_incoming_webhook.jsx b/webapp/components/backstage/add_incoming_webhook.jsx
index cb7828698..8beec3ff5 100644
--- a/webapp/components/backstage/add_incoming_webhook.jsx
+++ b/webapp/components/backstage/add_incoming_webhook.jsx
@@ -67,7 +67,7 @@ export default class AddIncomingWebhook extends React.Component {
                 saving: false,
                 clientError: (
                     <FormattedMessage
-                        id='add_incoming_webhook.channel_required'
+                        id='add_incoming_webhook.channelRequired'
                         defaultMessage='A valid channel is required'
                     />
                 )
@@ -124,7 +124,7 @@ export default class AddIncomingWebhook extends React.Component {
                     <div className='backstage__header'>
                         <h1 className='text'>
                             <FormattedMessage
-                                id='add-incoming-webhook.header'
+                                id='add_incoming_webhook.header'
                                 defaultMessage='Add Incoming Webhook'
                             />
                         </h1>
@@ -137,7 +137,7 @@ export default class AddIncomingWebhook extends React.Component {
                             htmlFor='name'
                         >
                             <FormattedMessage
-                                id='add-incoming-webhook.name'
+                                id='add_incoming_webhook.name'
                                 defaultMessage='Name'
                             />
                         </label>
@@ -154,7 +154,7 @@ export default class AddIncomingWebhook extends React.Component {
                             htmlFor='description'
                         >
                             <FormattedMessage
-                                id='add-incoming-webhook.description'
+                                id='add_incoming_webhook.description'
                                 defaultMessage='Description'
                             />
                         </label>
@@ -171,7 +171,7 @@ export default class AddIncomingWebhook extends React.Component {
                             htmlFor='channelId'
                         >
                             <FormattedMessage
-                                id='add-incoming-webhook.channelId'
+                                id='add_incoming_webhook.channel'
                                 defaultMessage='Channel'
                             />
                         </label>
@@ -187,7 +187,7 @@ export default class AddIncomingWebhook extends React.Component {
                             to={`/${team.name}/integrations/add`}
                         >
                             <FormattedMessage
-                                id='add-incoming-webhook.cancel'
+                                id='add_incoming_webhook.cancel'
                                 defaultMessage='Cancel'
                             />
                         </Link>
@@ -198,7 +198,7 @@ export default class AddIncomingWebhook extends React.Component {
                             onClick={this.handleSubmit}
                         >
                             <FormattedMessage
-                                id='add-incoming-webhook.save'
+                                id='add_incoming_webhook.save'
                                 defaultMessage='Save'
                             />
                         </SpinnerButton>
diff --git a/webapp/components/backstage/add_integration.jsx b/webapp/components/backstage/add_integration.jsx
index 1ca079bb7..c821c0898 100644
--- a/webapp/components/backstage/add_integration.jsx
+++ b/webapp/components/backstage/add_integration.jsx
@@ -94,7 +94,7 @@ export default class AddIntegration extends React.Component {
                     <div className='backstage__header'>
                         <h1 className='text'>
                             <FormattedMessage
-                                id='add-integration.header'
+                                id='add_integration.header'
                                 defaultMessage='Add Integration'
                             />
                         </h1>
diff --git a/webapp/components/backstage/add_outgoing_webhook.jsx b/webapp/components/backstage/add_outgoing_webhook.jsx
index 56002dca4..ea530ff57 100644
--- a/webapp/components/backstage/add_outgoing_webhook.jsx
+++ b/webapp/components/backstage/add_outgoing_webhook.jsx
@@ -71,7 +71,7 @@ export default class AddOutgoingWebhook extends React.Component {
                 saving: false,
                 clientError: (
                     <FormattedMessage
-                        id='add_outgoing_webhook.trigger_words_required'
+                        id='add_outgoing_webhook.triggerWordsOrChannelRequired'
                         defaultMessage='A valid channel or a list of trigger words is required'
                     />
                 )
@@ -85,7 +85,7 @@ export default class AddOutgoingWebhook extends React.Component {
                 saving: false,
                 clientError: (
                     <FormattedMessage
-                        id='add_outgoing_webhook.callback_urls_required'
+                        id='add_outgoing_webhook.callbackUrlsRequired'
                         defaultMessage='One or more callback URLs are required'
                     />
                 )
@@ -156,7 +156,7 @@ export default class AddOutgoingWebhook extends React.Component {
                     <div className='backstage__header'>
                         <h1 className='text'>
                             <FormattedMessage
-                                id='add-outgoing-webhook.header'
+                                id='add_outgoing_webhook.header'
                                 defaultMessage='Add Outgoing Webhook'
                             />
                         </h1>
@@ -169,7 +169,7 @@ export default class AddOutgoingWebhook extends React.Component {
                             htmlFor='name'
                         >
                             <FormattedMessage
-                                id='add-outgoing-webhook.name'
+                                id='add_outgoing_webhook.name'
                                 defaultMessage='Name'
                             />
                         </label>
@@ -186,7 +186,7 @@ export default class AddOutgoingWebhook extends React.Component {
                             htmlFor='description'
                         >
                             <FormattedMessage
-                                id='add-outgoing-webhook.description'
+                                id='add_outgoing_webhook.description'
                                 defaultMessage='Description'
                             />
                         </label>
@@ -203,7 +203,7 @@ export default class AddOutgoingWebhook extends React.Component {
                             htmlFor='channelId'
                         >
                             <FormattedMessage
-                                id='add-outgoing-webhook.channelId'
+                                id='add_outgoing_webhook.channel'
                                 defaultMessage='Channel'
                             />
                         </label>
@@ -219,7 +219,7 @@ export default class AddOutgoingWebhook extends React.Component {
                             htmlFor='triggerWords'
                         >
                             <FormattedMessage
-                                id='add-outgoing-webhook.triggerWords'
+                                id='add_outgoing_webhook.triggerWords'
                                 defaultMessage='Trigger Words (One Per Line)'
                             />
                         </label>
@@ -236,7 +236,7 @@ export default class AddOutgoingWebhook extends React.Component {
                             htmlFor='callbackUrls'
                         >
                             <FormattedMessage
-                                id='add-outgoing-webhook.callbackUrls'
+                                id='add_outgoing_webhook.callbackUrls'
                                 defaultMessage='Callback URLs (One Per Line)'
                             />
                         </label>
@@ -253,7 +253,7 @@ export default class AddOutgoingWebhook extends React.Component {
                             to={`/${team.name}/integrations/add`}
                         >
                             <FormattedMessage
-                                id='add-outgoing-webhook.cancel'
+                                id='add_outgoing_webhook.cancel'
                                 defaultMessage='Cancel'
                             />
                         </Link>
@@ -264,7 +264,7 @@ export default class AddOutgoingWebhook extends React.Component {
                             onClick={this.handleSubmit}
                         >
                             <FormattedMessage
-                                id='add-outgoing-webhook.save'
+                                id='add_outgoing_webhook.save'
                                 defaultMessage='Save'
                             />
                         </SpinnerButton>
diff --git a/webapp/components/backstage/backstage_navbar.jsx b/webapp/components/backstage/backstage_navbar.jsx
index 8ba8669c5..555165791 100644
--- a/webapp/components/backstage/backstage_navbar.jsx
+++ b/webapp/components/backstage/backstage_navbar.jsx
@@ -47,7 +47,7 @@ export default class BackstageNavbar extends React.Component {
                     <i className='fa fa-angle-left'/>
                     <span>
                         <FormattedMessage
-                            id='backstage.back_to_mattermost'
+                            id='backstage_navbar.backToMattermost'
                             defaultMessage='Back to {siteName}'
                             values={{
                                 siteName: global.window.mm_config.SiteName
@@ -55,7 +55,6 @@ export default class BackstageNavbar extends React.Component {
                         />
                     </span>
                 </Link>
-                <span style={{float: 'right'}}>{'TODO: Switch Teams'}</span>
             </div>
         );
     }
diff --git a/webapp/components/backstage/backstage_sidebar.jsx b/webapp/components/backstage/backstage_sidebar.jsx
index 78968262a..ab9afd3fc 100644
--- a/webapp/components/backstage/backstage_sidebar.jsx
+++ b/webapp/components/backstage/backstage_sidebar.jsx
@@ -50,7 +50,7 @@ export default class BackstageSidebar extends React.Component {
                         icon='fa-link'
                         title={
                             <FormattedMessage
-                                id='backstage.integrations'
+                                id='backstage_sidebar.integrations'
                                 defaultMessage='Integrations'
                             />
                         }
@@ -59,7 +59,7 @@ export default class BackstageSidebar extends React.Component {
                             name='installed'
                             title={(
                                 <FormattedMessage
-                                    id='backstage.integrations.installed'
+                                    id='backstage_sidebar.integrations.installed'
                                     defaultMessage='Installed Integrations'
                                 />
                             )}
@@ -68,7 +68,7 @@ export default class BackstageSidebar extends React.Component {
                             name='add'
                             title={(
                                 <FormattedMessage
-                                    id='backstage.integrations.add'
+                                    id='backstage_sidebar.integrations.add'
                                     defaultMessage='Add Integration'
                                 />
                             )}
@@ -78,7 +78,7 @@ export default class BackstageSidebar extends React.Component {
                                 name='incoming_webhook'
                                 title={(
                                     <FormattedMessage
-                                        id='backstage.integrations.add.incomingWebhook'
+                                        id='backstage_sidebar.integrations.add.incomingWebhook'
                                         defaultMessage='Incoming Webhook'
                                     />
                                 )}
@@ -87,7 +87,7 @@ export default class BackstageSidebar extends React.Component {
                                 name='outgoing_webhook'
                                 title={(
                                     <FormattedMessage
-                                        id='backstage.integrations.add.outgoingWebhook'
+                                        id='backstage_sidebar.integrations.add.outgoingWebhook'
                                         defaultMessage='Outgoing Webhook'
                                     />
                                 )}
-- 
cgit v1.2.3-1-g7c22