Skip to content

Commit

Permalink
Merge pull request #63 from nightskylark/Prepare_18.2.3
Browse files Browse the repository at this point in the history
Prepare 18.2.3
  • Loading branch information
nightskylark authored Nov 8, 2018
2 parents e11587a + 825d70e commit 0e73a38
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ Using *Intl* is an alternative to the *Globalize* based mechanism [documented he
Add a script tag for `devextreme-intl` behind your tag for the `devextreme` script:

```html
<script src="https://unpkg.com/devextreme-intl@18.1/dist/devextreme-intl.js"></script>
<script src="https://unpkg.com/devextreme-intl@18.2/dist/devextreme-intl.js"></script>
```

or

```html
<script src="https://unpkg.com/devextreme-intl@18.1/dist/devextreme-intl.min.js"></script>
<script src="https://unpkg.com/devextreme-intl@18.2/dist/devextreme-intl.min.js"></script>
```

See [this example with the relevant script tag in place](/examples/bundled.html).
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "devextreme-intl",
"description": "Integrates ECMAScript Internationalization API with DevExtreme",
"version": "18.1.7",
"version": "18.2.3",
"author": "Developer Express Inc.",
"license": "MIT",
"repository": {
Expand All @@ -14,12 +14,12 @@
"dist/devextreme-intl.min.js"
],
"peerDependencies": {
"devextreme": "17.1 - 18.1"
"devextreme": "17.1 - 18.2"
},
"devDependencies": {
"cldr-core": "latest",
"cldrjs": "^0.3.1",
"devextreme": "17.1 - 18.1",
"devextreme": "17.1 - 18.2",
"eslint": "^3.10.2",
"intl": "^1.2.5",
"jquery": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/locale-data-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ var LOCALE_DATA_FOLDER = 'locale-data';
try {
fs.mkdirSync(LOCALE_DATA_FOLDER);
} catch(e) { } // eslint-disable-line no-empty
fs.writeFile(path.join(LOCALE_DATA_FOLDER, 'first-day-of-week-data.js'), 'module.exports = ' + JSON.stringify(result, null, ' ') + ';');
fs.writeFileSync(path.join(LOCALE_DATA_FOLDER, 'first-day-of-week-data.js'), 'module.exports = ' + JSON.stringify(result, null, ' ') + ';');
2 changes: 1 addition & 1 deletion tests/date-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ locales.forEach(function(localeId) {
{ format: 'longtime', date: new Date(currentDate.getFullYear(), currentDate.getMonth(), currentDate.getDate(), 12, 59, 59) },
];

if(compareVersions(dxVersion, '17.2.3') >= 0) {
if(compareVersions(dxVersion, '17.2.3') >= 0 && compareVersions(dxVersion, '18.2.3') !== 0) {
Array.prototype.push.apply(testData, [
{ format: 'longDate', date: new Date(2016, 10, 17) },
{ format: 'longDate', date: new Date(2016, 11, 31) },
Expand Down

0 comments on commit 0e73a38

Please sign in to comment.