diff --git a/packages/notification/package.json b/packages/notification/package.json index 46ba0618b53d33643f64b4932640a87bcc4a3efa..26902720812829dcd2f7e937eb921789a16fe19e 100644 --- a/packages/notification/package.json +++ b/packages/notification/package.json @@ -25,7 +25,6 @@ "vpu-common": "file:./vendor/common" }, "dependencies": { - "i18next": "^17.0.3", "lit-element": "^2.1.0" }, "scripts": { diff --git a/packages/notification/rollup.config.js b/packages/notification/rollup.config.js index 5b589a6b53e7c67349edfa64b3fa0586829a4882..92e6250bc295acd951eb7b4218fda5d7a218de3d 100644 --- a/packages/notification/rollup.config.js +++ b/packages/notification/rollup.config.js @@ -1,3 +1,4 @@ +import path from 'path'; import resolve from 'rollup-plugin-node-resolve'; import commonjs from 'rollup-plugin-commonjs'; import postcss from 'rollup-plugin-postcss'; @@ -19,7 +20,12 @@ export default { }, plugins: [ multiEntry(), - resolve(), + resolve({ + customResolveOptions: { + // ignore node_modules from vendored packages + moduleDirectory: path.join(process.cwd(), 'node_modules') + } + }), commonjs({ include: 'node_modules/**' }), diff --git a/packages/notification/src/i18n.js b/packages/notification/src/i18n.js index a2380632e7095df7cc09dddf372598f5d6b5898c..02c88eb4fd48d17e453af6166addcd7583e92479 100644 --- a/packages/notification/src/i18n.js +++ b/packages/notification/src/i18n.js @@ -1,29 +1,6 @@ -import i18next from 'i18next'; +import {createInstance} from 'vpu-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; -const i18n = i18next.createInstance(); - -i18n.init({ - lng: 'de', - fallbackLng: ['de'], - debug: false, - initImmediate: false, // Don't init async - resources: { - en: {translation: en}, - de: {translation: de} - }, -}); - -console.assert(i18n.isInitialized); - -function dateTimeFormat(date, options) { - return new Intl.DateTimeFormat(i18n.languages, options).format(date); -} - -function numberFormat(number, options) { - return new Intl.NumberFormat(i18n.languages, options).format(number); -} - -export {i18n, dateTimeFormat, numberFormat}; +export const i18n = createInstance({en: en, de: de}, 'de', 'en'); \ No newline at end of file diff --git a/packages/notification/vendor/common b/packages/notification/vendor/common index b30eaa6475ccc65b5f99d2ead86ddbe2b8e015a7..378256b0ae92712fd5b8feed3a987cd014617c0b 160000 --- a/packages/notification/vendor/common +++ b/packages/notification/vendor/common @@ -1 +1 @@ -Subproject commit b30eaa6475ccc65b5f99d2ead86ddbe2b8e015a7 +Subproject commit 378256b0ae92712fd5b8feed3a987cd014617c0b