openstack
/
tripleo-ui
Code Issues Proposed changes

Merge "i18n for minor string on DeployStep"

This commit is contained in:
Jenkins 2017-01-25 20:47:28 +00:00 committed by Gerrit Code Review
parent adc81229ae d672a1e5e8
commit 317819bd68
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/js/components/deployment_plan/DeployStep.js
View File

@ -1,4 +1,4 @@
import { defineMessages, FormattedMessage } from 'react-intl';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import React from 'react';
@ -13,12 +13,16 @@ const messages = defineMessages({
validateAndDeploy: {
id: 'DeployStep.validateAndDeploy',
defaultMessage: 'Validate and Deploy'
},
requestingDeploy: {
id: 'DeployStep.requestingDeploy',
defaultMessage: 'Requesting a deploy...'
}
});
const DeployStep = ({ currentPlan, currentStack, currentStackResources, currentStackResourcesLoaded,
currentStackDeploymentProgress, deleteStack, deployPlan, fetchStackResource,
fetchStackEnvironment, isRequestingStackDelete, stacksLoaded }) => {
fetchStackEnvironment, intl, isRequestingStackDelete, stacksLoaded }) => {
if (!currentStack || currentStack.stack_status === stackStates.DELETE_COMPLETE) {
return (
@ -27,7 +31,7 @@ const DeployStep = ({ currentPlan, currentStack, currentStackResources, currentS
disabled={currentPlan.isRequestingPlanDeploy}
to="/deployment-plan/deployment-detail">
<Loader loaded={!currentPlan.isRequestingPlanDeploy}
content="Requesting a deploy..."
content={intl.formatMessage(messages.requestingDeploy)}
component="span"
inline>
<span className="fa fa-cloud-upload"/> <FormattedMessage
@ -72,8 +76,9 @@ DeployStep.propTypes = {
deployPlan: React.PropTypes.func.isRequired,
fetchStackEnvironment: React.PropTypes.func.isRequired,
fetchStackResource: React.PropTypes.func.isRequired,
intl: React.PropTypes.object,
isRequestingStackDelete: React.PropTypes.bool.isRequired,
stacksLoaded: React.PropTypes.bool.isRequired
};
export default DeployStep;
export default injectIntl(DeployStep);