From 520f07ec23a8b3078a0ca0e2d3cb98e58c423d0d Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Wed, 5 Jun 2019 17:09:35 -0300 Subject: [PATCH 1/3] remove yalc react-viewerbase --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4de3cf1c2..c1c88dfa8 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "react-resize-detector": "^3.4.0", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", - "react-viewerbase": "file:.yalc/react-viewerbase", + "react-viewerbase": "0.4.2", "react-vtkjs-viewport": "^0.0.7", "redux": "^4.0.1", "redux-oidc": "3.1.x" From a11fae01dc67c9e3831c54f55da1e4108ae33cc3 Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Wed, 5 Jun 2019 17:09:54 -0300 Subject: [PATCH 2/3] use t prop from withTranslation --- src/components/Header/Header.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index 3c0c7f0da..624b8dd15 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { Link, withRouter } from 'react-router-dom'; import { Dropdown } from 'react-viewerbase'; import { withTranslation } from 'react-i18next'; -import i18n, { t } from 'ohif-i18n'; +import i18n from 'ohif-i18n'; import './Header.css'; import OHIFLogo from '../OHIFLogo/OHIFLogo.js'; import ConnectedUserPreferencesModal from '../../connectedComponents/ConnectedUserPreferencesModal.js'; @@ -13,7 +13,8 @@ class Header extends Component { home: PropTypes.bool.isRequired, location: PropTypes.object.isRequired, openUserPreferencesModal: PropTypes.func, - children: PropTypes.node + children: PropTypes.node, + t: PropTypes.func.isRequired, }; static defaultProps = { @@ -32,6 +33,7 @@ class Header extends Component { } loadOptions() { + const { t } = this.props; this.options = [ { title: t('preferences'), @@ -49,12 +51,13 @@ class Header extends Component { changeLanguage(language) { i18n.init({ fallbackLng: language.substring(0, 2), - lng: language + lng: language, }); this.loadOptions(); } render() { + const { t } = this.props; return (
@@ -108,11 +111,7 @@ class Header extends Component { > ES-MX - +
From a747590ab887b1f65f6939cce63d8f791dd24410 Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Wed, 5 Jun 2019 17:36:38 -0300 Subject: [PATCH 3/3] fix typo --- extensions/ohif-i18n/src/locales/en/US/Header.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ohif-i18n/src/locales/en/US/Header.json b/extensions/ohif-i18n/src/locales/en/US/Header.json index 5ee6f4f79..651730074 100644 --- a/extensions/ohif-i18n/src/locales/en/US/Header.json +++ b/extensions/ohif-i18n/src/locales/en/US/Header.json @@ -1,4 +1,4 @@ { - "options": "Erik Options", + "options": "Options", "about": "About" }