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
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

No files matched your search

@@ -1,4 +1,4 @@
import { addLocales } from 'ohif-i18n';
import { addLocales } from '@ohif/i18n';
function loadLocales() {
const context = require.context(`./locales`, true, /\.json$/);
@@ -0,0 +1,3 @@
{
"Rotate": "Rotacionar VTK"
}