Skip to content

Commit ada60da

Browse files
mpreyskurantovmpreyskurantov
authored
fix: return localization dictionaries back (#28516)
1 parent 24e6b9f commit ada60da

47 files changed

Lines changed: 56 additions & 56 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/demos/Demos/Localization/UsingGlobalize/Angular/app/app.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import 'devextreme/localization/globalize/date';
88
import 'devextreme/localization/globalize/currency';
99
import 'devextreme/localization/globalize/message';
1010

11-
import deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json';
12-
import ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json';
11+
import deMessages from 'npm:devextreme/localization/messages/de.json!json';
12+
import ruMessages from 'npm:devextreme/localization/messages/ru.json!json';
1313

1414
import deCldrData from 'npm:devextreme-cldr-data/de.json!json';
1515
import ruCldrData from 'npm:devextreme-cldr-data/ru.json!json';

‎apps/demos/Demos/Localization/UsingGlobalize/React/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import 'devextreme/localization/globalize/date';
99
import 'devextreme/localization/globalize/currency';
1010
import 'devextreme/localization/globalize/message';
1111

12-
import deMessages from 'devextreme/common/core/localization/messages/de.json';
13-
import ruMessages from 'devextreme/common/core/localization/messages/ru.json';
12+
import deMessages from 'devextreme/localization/messages/de.json';
13+
import ruMessages from 'devextreme/localization/messages/ru.json';
1414

1515
import deCldrData from 'devextreme-cldr-data/de.json';
1616
import ruCldrData from 'devextreme-cldr-data/ru.json';

‎apps/demos/Demos/Localization/UsingGlobalize/ReactJs/App.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'devextreme/localization/globalize/number';
77
import 'devextreme/localization/globalize/date';
88
import 'devextreme/localization/globalize/currency';
99
import 'devextreme/localization/globalize/message';
10-
import deMessages from 'devextreme/common/core/localization/messages/de.json';
11-
import ruMessages from 'devextreme/common/core/localization/messages/ru.json';
10+
import deMessages from 'devextreme/localization/messages/de.json';
11+
import ruMessages from 'devextreme/localization/messages/ru.json';
1212
import deCldrData from 'devextreme-cldr-data/de.json';
1313
import ruCldrData from 'devextreme-cldr-data/ru.json';
1414
import supplementalCldrData from 'devextreme-cldr-data/supplemental.json';

‎apps/demos/Demos/Localization/UsingGlobalize/Vue/App.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ import 'devextreme/localization/globalize/currency';
6969
import 'devextreme/localization/globalize/message';
7070
/* eslint-disable import/no-unresolved */
7171
/* eslint-disable import/no-webpack-loader-syntax */
72-
import * as deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json';
73-
import * as ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json';
72+
import * as deMessages from 'npm:devextreme/localization/messages/de.json!json';
73+
import * as ruMessages from 'npm:devextreme/localization/messages/ru.json!json';
7474
import * as deCldrData from 'npm:devextreme-cldr-data/de.json!json';
7575
import * as ruCldrData from 'npm:devextreme-cldr-data/ru.json!json';
7676
import * as supplementalCldrData from 'npm:devextreme-cldr-data/supplemental.json!json';

‎apps/demos/Demos/Localization/UsingIntl/Angular/app/app.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { DxSelectBoxModule, DxDataGridModule } from 'devextreme-angular';
55

66
import { locale, loadMessages, formatMessage } from 'devextreme/localization';
77

8-
import deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json';
9-
import ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json';
8+
import deMessages from 'npm:devextreme/localization/messages/de.json!json';
9+
import ruMessages from 'npm:devextreme/localization/messages/ru.json!json';
1010
import { Locale, Payment, Service } from './app.service';
1111

1212
if (!/localhost/.test(document.location.host)) {

‎apps/demos/Demos/Localization/UsingIntl/React/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import React, { useState } from 'react';
44
import DataGrid, { Column, Editing, FilterRow } from 'devextreme-react/data-grid';
55
import SelectBox, { SelectBoxTypes } from 'devextreme-react/select-box';
66

7-
import deMessages from 'devextreme/common/core/localization/messages/de.json';
8-
import ruMessages from 'devextreme/common/core/localization/messages/ru.json';
7+
import deMessages from 'devextreme/localization/messages/de.json';
8+
import ruMessages from 'devextreme/localization/messages/ru.json';
99
import { locale, loadMessages, formatMessage } from 'devextreme/localization';
1010

1111
import service from './data.ts';

‎apps/demos/Demos/Localization/UsingIntl/ReactJs/App.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import React, { useState } from 'react';
44
import DataGrid, { Column, Editing, FilterRow } from 'devextreme-react/data-grid';
55
import SelectBox from 'devextreme-react/select-box';
6-
import deMessages from 'devextreme/common/core/localization/messages/de.json';
7-
import ruMessages from 'devextreme/common/core/localization/messages/ru.json';
6+
import deMessages from 'devextreme/localization/messages/de.json';
7+
import ruMessages from 'devextreme/localization/messages/ru.json';
88
import { locale, loadMessages, formatMessage } from 'devextreme/localization';
99
import service from './data.js';
1010

‎apps/demos/Demos/Localization/UsingIntl/Vue/App.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ import {
6565
import DxSelectBox, { DxSelectBoxTypes } from 'devextreme-vue/select-box';
6666
/* eslint-disable import/no-unresolved */
6767
/* eslint-disable import/no-webpack-loader-syntax */
68-
import * as deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json';
69-
import * as ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json';
68+
import * as deMessages from 'npm:devextreme/localization/messages/de.json!json';
69+
import * as ruMessages from 'npm:devextreme/localization/messages/ru.json!json';
7070
import { locale as dxLocale, loadMessages, formatMessage as dxFormatMessage } from 'devextreme/localization';
7171
import service from './data.ts';
7272

‎apps/demos/configs/React/config.bundle.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const bundleConfig = {
4747
},
4848
map: {
4949
'devextreme.react.systemjs.js': '../../../../bundles/devextreme.react.systemjs.js',
50-
'devextreme/common/core/localization/messages': 'npm:devextreme/common/core/localization/messages',
50+
'devextreme/localization/messages': 'npm:devextreme/localization/messages',
5151
},
5252
packages: {
5353
'react': {

‎apps/demos/configs/React/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ window.config = {
161161
'devextreme/events/utils': {
162162
main: 'index',
163163
},
164-
'devextreme/common/core/localization/messages': {
164+
'devextreme/localization/messages': {
165165
format: 'json',
166166
defaultExtension: 'json',
167167
},

0 commit comments

Comments
 (0)