TrizTech/ohif-viewer
17
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics

Browse Source 
# Conflicts:
#	extensions/ohif-vtk-extension/package.json
#	extensions/ohif-vtk-extension/rollup.config.js
#	extensions/ohif-vtk-extension/yarn.lock
#	package.json
#	src/App.js
#	src/components/Header/Header.js
#	yarn.lock
This commit is contained in:
romulo bordezani committed 2019-06-10 14:54:18 -03:00
1 parent 0753e9ec3c
commit d5909f8d74
9 files changed
+39 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

extensions/ohif-vtk-extension/package.json
+4 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-vtk",
"version": "0.0.2",
"version": "0.0.3",
"description": "OHIF extension for VTK.js",
"author": "OHIF",
"license": "MIT",
@@ -25,7 +25,7 @@
"dicom-parser": "^1.8.3",
"hammerjs": "^2.0.8",
"ohif-core": "^0.3.3",
"ohif-i18n": "file:.yalc/ohif-i18n",
"@ohif/i18n": "0.0.1-rc-001",
"prop-types": "^15.6.2",
"react": "^15.0.0 || ^16.0.0",
"react-dom": "^15.0.0 || ^16.0.0",
@@ -41,6 +41,7 @@
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/preset-env": "^7.2.3",
"@babel/preset-react": "^7.0.0",
"@ohif/i18n": "0.0.1-rc-001",
"babel-eslint": "^10.0.1",
"cross-env": "^5.2.0",
"eslint": "5.13.0",
@@ -92,6 +93,7 @@
},
"dependencies": {
"@babel/runtime": "^7.2.0",
"@ohif/extension-vtk": "file:.yalc/@ohif/extension-vtk",
"classnames": "^2.2.6",
"react-vtkjs-viewport": "^0.0.7"
}
extensions/ohif-vtk-extension/src/loadLocales.js
+1 -1
View File
@@ -1,4 +1,4 @@
import { addLocales } from 'ohif-i18n';
import { addLocales } from '@ohif/i18n';
function loadLocales() {
const context = require.context(`./locales`, true, /\.json$/);
extensions/ohif-vtk-extension/src/locales/en/US/Buttons.json → extensions/ohif-vtk-extension/src/locales/en/Buttons.json
View File
File renamed without changes.
extensions/ohif-vtk-extension/src/locales/es/Buttons.json
+3
View File
@@ -0,0 +1,3 @@
{
"Rotate": "Rotacionar VTK"
}
extensions/ohif-vtk-extension/yarn.lock
+15
View File
@@ -727,6 +727,21 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
"@ohif/extension-vtk@file:.yalc/@ohif/extension-vtk":
version "0.0.3-9acf58f8"
dependencies:
"@babel/runtime" "^7.2.0"
classnames "^2.2.6"
react-vtkjs-viewport "^0.0.7"
"@ohif/i18n@0.0.1-rc-001":
version "0.0.1-rc-001"
resolved "https://registry.yarnpkg.com/@ohif/i18n/-/i18n-0.0.1-rc-001.tgz#47286daa1411efb5f0219f0310484c8919bfe607"
integrity sha512-CJ9wqd15DpJ6adVMyXkyqQqcRZgSnMWJ7L3WyUpMqf66CvAFKzCUuckyiFeCupIq8ZGv7w4jaADSYKrLcpviUw==
dependencies:
"@babel/runtime" "^7.2.0"
classnames "^2.2.6"
"@samverschueren/stream-to-observable@^0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"