diff --git a/package-lock.json b/package-lock.json index 500e813a3..f4d8012d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@floating-ui/dom": "^1.7.4", "@lit-labs/virtualizer": "^2.1.1", "@lit/context": "^1.1.6", - "igniteui-i18n-core": "0.7.0-alpha.8", + "igniteui-i18n-core": "1.0.1", "lit": "^3.3.1" }, "devDependencies": { @@ -37,7 +37,7 @@ "globby": "^16.0.0", "husky": "^9.1.7", "ig-typedoc-theme": "^7.0.1", - "igniteui-i18n-resources": "0.7.0-alpha.8", + "igniteui-i18n-resources": "1.0.1", "igniteui-theming": "^24.0.2", "keep-a-changelog": "^2.7.1", "lint-staged": "^16.2.7", @@ -7732,12 +7732,12 @@ } }, "node_modules/igniteui-i18n-core": { - "version": "0.7.0-alpha.8", - "resolved": "https://registry.npmjs.org/igniteui-i18n-core/-/igniteui-i18n-core-0.7.0-alpha.8.tgz", - "integrity": "sha512-xLBAWqi3fojF6VUWbUdEXq6mMhJNpz8ZgBO9YCF+QQ2Um6SlcSlG5oiid7I4FrFpSxPzmvmOZmz61dBw8QyAJA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/igniteui-i18n-core/-/igniteui-i18n-core-1.0.1.tgz", + "integrity": "sha512-d0GKNRClOW8o3vHFKce22fcHMH+M3ZMI1f1clD9pZWHBij9zUB/iR+pdt4R/hcJzzCXV7uPYywSnQSNORRMYfw==", "license": "SEE LICENSE IN LICENSE", "peerDependencies": { - "igniteui-i18n-resources": "0.7.0-alpha.8" + "igniteui-i18n-resources": "1.0.1" }, "peerDependenciesMeta": { "igniteui-i18n-resources": { @@ -7746,13 +7746,13 @@ } }, "node_modules/igniteui-i18n-resources": { - "version": "0.7.0-alpha.8", - "resolved": "https://registry.npmjs.org/igniteui-i18n-resources/-/igniteui-i18n-resources-0.7.0-alpha.8.tgz", - "integrity": "sha512-7lkKDZuw0DoIhx5URJex+FvkVJGh6e88TDGGp8f3KZGQValUtAR2WEWpj3SlwnGkld/ihjTGCYNQ4Riy7CRF6A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/igniteui-i18n-resources/-/igniteui-i18n-resources-1.0.1.tgz", + "integrity": "sha512-doBn2SLT7ZavUvmSQhu0FRTp7bQbf2OsrZfFoFEXmkAck5A/28S5PUseetVWHJ16eUKrKPJjYBGDWleYs1mtWg==", "devOptional": true, "license": "MIT", "dependencies": { - "igniteui-i18n-core": "0.7.0-alpha.8" + "igniteui-i18n-core": "1.0.1" } }, "node_modules/igniteui-theming": { diff --git a/package.json b/package.json index 6cee80416..e6cf075ba 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@floating-ui/dom": "^1.7.4", "@lit-labs/virtualizer": "^2.1.1", "@lit/context": "^1.1.6", - "igniteui-i18n-core": "0.7.0-alpha.8", + "igniteui-i18n-core": "^1.0.1", "lit": "^3.3.1" }, "devDependencies": { @@ -81,7 +81,7 @@ "globby": "^16.0.0", "husky": "^9.1.7", "ig-typedoc-theme": "^7.0.1", - "igniteui-i18n-resources": "0.7.0-alpha.8", + "igniteui-i18n-resources": "^1.0.1", "igniteui-theming": "^24.0.2", "keep-a-changelog": "^2.7.1", "lint-staged": "^16.2.7", diff --git a/scripts/_package.json b/scripts/_package.json index 7b282fc97..98a1e7739 100644 --- a/scripts/_package.json +++ b/scripts/_package.json @@ -83,10 +83,12 @@ "@floating-ui/dom": "^1.7.0", "@lit-labs/virtualizer": "^2.1.0", "@lit/context": "^1.1.0", + "igniteui-i18n-core": "^1.0.1", "lit": "^3.3.0" }, "peerDependencies": { "dompurify": "^3.3.0", + "igniteui-i18n-resources": "^1.0.1", "marked": "^17.0.0", "marked-shiki": "^1.2.0", "shiki": "^3.15.0" @@ -95,6 +97,9 @@ "dompurify": { "optional": true }, + "igniteui-i18n-resources": { + "optional": true + }, "marked": { "optional": true }, diff --git a/src/components/date-time-input/date-time-input.spec.ts b/src/components/date-time-input/date-time-input.spec.ts index 824ec677a..d10f504f3 100644 --- a/src/components/date-time-input/date-time-input.spec.ts +++ b/src/components/date-time-input/date-time-input.spec.ts @@ -156,7 +156,7 @@ describe('Date Time Input component', () => { el.value = new Date(2020, 9, 12, 12); el.displayFormat = 'd.MM hh:mm ttt'; await elementUpdated(el); - expect(input.value).to.equal('12.10 12:00 PM'); + expect(input.value).to.equal('12.10 12:00 pm'); el.displayFormat = 'd.MM hh:mm ttttt'; await elementUpdated(el); diff --git a/src/components/date-time-input/date-util.ts b/src/components/date-time-input/date-util.ts index 1afbfd198..9f7f17d92 100644 --- a/src/components/date-time-input/date-util.ts +++ b/src/components/date-time-input/date-util.ts @@ -430,9 +430,11 @@ export abstract class DateTimeUtil { let date = new Date(newDate); switch (amPmFromMask) { + case 'am': case 'AM': date = new Date(newDate.setHours(newDate.getHours() + 12)); break; + case 'pm': case 'PM': date = new Date(newDate.setHours(newDate.getHours() - 12)); break;