Skip to content

Commit 5c4f4ad

Browse files
authored
Merge pull request DevExpress#83 from DevExpress/stop
Skip Intl injection for DevExtreme >= 19.2
2 parents 4bcc452 + 3ce7b3f commit 5c4f4ad

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

src/date.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ var monthNameStrategies = {
132132
return monthNameStrategies.standalone(monthIndex, monthFormat);
133133
}
134134
};
135-
136-
dateLocalization.resetInjection();
137-
dateLocalization.inject({
135+
var intlDateLocalization = {
138136
getMonthNames: function(format, type) {
139137
var intlFormats = {
140138
wide: 'long',
@@ -331,4 +329,17 @@ dateLocalization.inject({
331329

332330
return index === undefined ? 1 : index;
333331
}
334-
});
332+
};
333+
334+
var intlIsEmbedded = compareVersions(dxVersion, '19.2.1') > -1;
335+
var intlIsActive = dateLocalization.engine && dateLocalization.engine() === 'intl';
336+
337+
if(!intlIsEmbedded || !intlIsActive) {
338+
dateLocalization.resetInjection();
339+
dateLocalization.inject(intlDateLocalization);
340+
341+
if(intlIsEmbedded) {
342+
// eslint-disable-next-line no-console
343+
console.log('Since v19.2, Intl localization utilities are included in DevExtreme. Do not use the separate devextreme-intl module.');
344+
}
345+
}

src/number.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ var currencyOptionsCache = {},
2020
return (new Intl.NumberFormat(locale(), { style: 'currency', currency: currency }));
2121
};
2222

23-
numberLocalization.resetInjection();
24-
numberLocalization.inject({
23+
var intlNumberLocalization = {
2524
_formatNumberCore: function(value, format, formatConfig) {
2625
if(format === 'exponential') {
2726
return this.callBase.apply(this, arguments);
@@ -189,4 +188,17 @@ numberLocalization.inject({
189188
options = this._getCurrencyOptions(currencyValue);
190189
return this._createOpenXmlCurrencyFormat(options);
191190
}
192-
});
191+
};
192+
193+
var intlIsEmbedded = compareVersions(dxVersion, '19.2.1') > -1;
194+
var intlIsActive = numberLocalization.engine && numberLocalization.engine() === 'intl';
195+
196+
if(!intlIsEmbedded || !intlIsActive) {
197+
if(intlIsEmbedded) {
198+
// eslint-disable-next-line no-console
199+
console.log('Since v19.2, Intl localization utilities are included in DevExtreme. Do not use the separate devextreme-intl module.');
200+
}
201+
202+
numberLocalization.resetInjection();
203+
numberLocalization.inject(intlNumberLocalization);
204+
}

0 commit comments

Comments
 (0)