From d5909f8d741385182d52840a96b18ed67bc73ba3 Mon Sep 17 00:00:00 2001 From: romulo bordezani Date: Mon, 10 Jun 2019 14:54:18 -0300 Subject: [PATCH] Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics # 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 --- .../img/ohif-i18n-extending-files-tree.png | Bin 22000 -> 21999 bytes extensions/ohif-i18n/package.json | 2 +- extensions/ohif-vtk-extension/package.json | 6 ++++-- .../ohif-vtk-extension/src/loadLocales.js | 2 +- .../src/locales/en/{US => }/Buttons.json | 0 .../src/locales/es/Buttons.json | 3 +++ extensions/ohif-vtk-extension/yarn.lock | 15 ++++++++++++++ package.json | 2 +- yarn.lock | 19 +++++++++++++----- 9 files changed, 39 insertions(+), 10 deletions(-) rename extensions/ohif-vtk-extension/src/locales/en/{US => }/Buttons.json (100%) create mode 100644 extensions/ohif-vtk-extension/src/locales/es/Buttons.json diff --git a/docs/latest/assets/img/ohif-i18n-extending-files-tree.png b/docs/latest/assets/img/ohif-i18n-extending-files-tree.png index 8bf3ff1759b5885fb05d1e96d18401d7a949db43..1166a533de94f07b54f9e43dad81c17b32b95870 100644 GIT binary patch delta 15 Wcmeycn(_T=MwZS1KlhESuR{Si?gpR$ delta 16 XcmaFAn(@PGM%K;%KX=}ZEU!ZWJ>3Sa diff --git a/extensions/ohif-i18n/package.json b/extensions/ohif-i18n/package.json index 291e46352..90059c7f8 100644 --- a/extensions/ohif-i18n/package.json +++ b/extensions/ohif-i18n/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/i18n", - "version": "0.0.2", + "version": "0.0.1-rc-001", "description": "OHIF extension for internationalization", "author": "OHIF", "license": "MIT", diff --git a/extensions/ohif-vtk-extension/package.json b/extensions/ohif-vtk-extension/package.json index 3a7b5ffc7..ea8ccfcbd 100644 --- a/extensions/ohif-vtk-extension/package.json +++ b/extensions/ohif-vtk-extension/package.json @@ -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" } diff --git a/extensions/ohif-vtk-extension/src/loadLocales.js b/extensions/ohif-vtk-extension/src/loadLocales.js index 90ce5c1d4..f88f89d61 100644 --- a/extensions/ohif-vtk-extension/src/loadLocales.js +++ b/extensions/ohif-vtk-extension/src/loadLocales.js @@ -1,4 +1,4 @@ -import { addLocales } from 'ohif-i18n'; +import { addLocales } from '@ohif/i18n'; function loadLocales() { const context = require.context(`./locales`, true, /\.json$/); diff --git a/extensions/ohif-vtk-extension/src/locales/en/US/Buttons.json b/extensions/ohif-vtk-extension/src/locales/en/Buttons.json similarity index 100% rename from extensions/ohif-vtk-extension/src/locales/en/US/Buttons.json rename to extensions/ohif-vtk-extension/src/locales/en/Buttons.json diff --git a/extensions/ohif-vtk-extension/src/locales/es/Buttons.json b/extensions/ohif-vtk-extension/src/locales/es/Buttons.json new file mode 100644 index 000000000..664a6a86c --- /dev/null +++ b/extensions/ohif-vtk-extension/src/locales/es/Buttons.json @@ -0,0 +1,3 @@ +{ + "Rotate": "Rotacionar VTK" +} diff --git a/extensions/ohif-vtk-extension/yarn.lock b/extensions/ohif-vtk-extension/yarn.lock index 4831e6ffb..26c0bb834 100644 --- a/extensions/ohif-vtk-extension/yarn.lock +++ b/extensions/ohif-vtk-extension/yarn.lock @@ -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" diff --git a/package.json b/package.json index 51c7bdc09..aecf4cab9 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "react-resize-detector": "^3.4.0", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", - "react-viewerbase": "0.7.0", + "react-viewerbase": "file:.yalc/react-viewerbase", "react-vtkjs-viewport": "^0.0.7", "redux": "^4.0.1", "redux-oidc": "3.1.x" diff --git a/yarn.lock b/yarn.lock index 287051e87..2397e59bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1042,8 +1042,16 @@ 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" + "@ohif/i18n@file:.yalc/@ohif/i18n": - version "0.0.2-4597feaf" + version "0.0.2-a44efe70" dependencies: "@babel/runtime" "^7.2.0" classnames "^2.2.6" @@ -11788,13 +11796,13 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react-viewerbase@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.7.0.tgz#b0f48a0f003b849c280b8ca67927d4780c68b0dc" - integrity sha512-1VQXREKSsqxtOSSHRou0gjBODrSOjE8SBJ6/dHG0gPgdmeotOg68xPMKYf9K7fYyGZ6CDA7oVCAmdTE4SVYP5Q== +"react-viewerbase@file:.yalc/react-viewerbase": + version "0.2.17-bffd4836" dependencies: "@babel/runtime" "7.2.0" + "@ohif/i18n" "0.0.1-rc-001" classnames "2.2.6" + i18next "^17.0.3" lodash.isequal "4.5.0" moment "2.24.0" prop-types "15.6.2" @@ -11802,6 +11810,7 @@ react-viewerbase@0.7.0: react-dates "18.4.1" react-dnd "7.0.2" react-dnd-html5-backend "7.0.2" + react-i18next "^10.11.0" react-with-direction "1.3.0" react-vtkjs-viewport@^0.0.7: