From 940b72bf6fde1ae2fdb75cff1a5194e7d702b35a Mon Sep 17 00:00:00 2001 From: Max Red Date: Fri, 28 Oct 2016 21:21:06 -0300 Subject: [PATCH] Max - add i18n [skip ci] --- client/src/app/demo/components-demo-page.js | 5 +---- client/src/core-components/info-tooltip.js | 5 +++-- client/src/core-components/info-tooltip.scss | 4 ++-- client/src/data/languages/en.js | 4 +++- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/src/app/demo/components-demo-page.js b/client/src/app/demo/components-demo-page.js index b19470a0..ef679cbd 100644 --- a/client/src/app/demo/components-demo-page.js +++ b/client/src/app/demo/components-demo-page.js @@ -173,10 +173,7 @@ let DemoPage = React.createClass({ { title: 'InfoTooltip', render: ( -
- - -
+ ) } ], diff --git a/client/src/core-components/info-tooltip.js b/client/src/core-components/info-tooltip.js index 6e78f557..b2c92f10 100644 --- a/client/src/core-components/info-tooltip.js +++ b/client/src/core-components/info-tooltip.js @@ -1,6 +1,7 @@ import React from 'react'; import classNames from 'classnames'; +import i18n from 'lib-app/i18n'; import Icon from 'core-components/icon'; import Tooltip from 'core-components/tooltip'; @@ -31,10 +32,10 @@ class InfoTooltip extends React.Component { } renderText() { - let message = (this.props.type === 'default') ? 'Information' : 'Warning'; + let message = (this.props.type === 'default') ? i18n('INFO') : i18n('WARNING'); return (
-
+
{message}
{this.props.text} diff --git a/client/src/core-components/info-tooltip.scss b/client/src/core-components/info-tooltip.scss index 4fc65c39..63691bad 100644 --- a/client/src/core-components/info-tooltip.scss +++ b/client/src/core-components/info-tooltip.scss @@ -2,7 +2,7 @@ .info-tooltip { &__text { - &__title { + &-title { color: $secondary-blue; font-size: $font-size--md; } @@ -18,7 +18,7 @@ } .info-tooltip__text { - &__title { + &-title { color: $primary-red; } } diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js index 25e74b18..556666fc 100644 --- a/client/src/data/languages/en.js +++ b/client/src/data/languages/en.js @@ -72,6 +72,8 @@ export default { 'UN_ASSIGN': 'Unassign', 'VIEW_TICKET': 'View Ticket', 'SELECT_CUSTOM_RESPONSE': 'Select a custom response...', + 'WARNING': 'Warning', + 'INFO': 'Information', //VIEW DESCRIPTIONS 'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.', @@ -108,4 +110,4 @@ export default { 'OLD_PASSWORD_INCORRECT': 'Old password is incorrect', 'WILL_LOSE_CHANGES': 'You haven\'t save. Your changes will be lost.', 'WILL_DELETE_CUSTOM_RESPONSE': 'The custom response will be deleted.' -}; \ No newline at end of file +};