Skip to content

Commit 74d7f50

Browse files
authored
fix: update and fix flatpickr integration (#710)
updates from 4 to 7 fixes missing localization
1 parent 2a9cdae commit 74d7f50

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed

addon/components/single-document-details.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
id="date"
101101
name="date"
102102
class="uk-input"
103-
@locale={{this.locale}}
103+
@locale={{this.flatpickrLocale}}
104104
@date={{or @document.date null}}
105105
@altFormat={{this.dateFormat}}
106106
@altInput={{true}}

addon/components/single-document-details.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { action } from "@ember/object";
22
import { inject as service } from "@ember/service";
33
import { tracked } from "@glimmer/tracking";
44
import { restartableTask, dropTask } from "ember-concurrency";
5+
import lang from "flatpickr/dist/l10n";
56
import { DateTime } from "luxon";
67

78
import DocumentCard from "./document-card";
@@ -24,12 +25,19 @@ export default class SingleDocumentDetailsComponent extends DocumentCard {
2425
@tracked editDate = false;
2526
@tracked validTitle = true;
2627

28+
get locale() {
29+
return this.intl.primaryLocale.split("-")[0];
30+
}
31+
32+
get flatpickrLocale() {
33+
return lang[this.locale];
34+
}
35+
2736
get dateFormat() {
28-
const language = this.intl.primaryLocale.split("-")[0];
2937
const defaultFormat = "m/d/Y";
3038
const formats = { de: "d.m.Y", fr: "d.m.Y", en: defaultFormat };
3139

32-
return formats[language] ?? defaultFormat;
40+
return formats[this.locale] ?? defaultFormat;
3341
}
3442

3543
get displayConvertButton() {

app/styles/ember-alexandria.scss

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
@import "custom-uikit-rules";
33
@import "ember-uikit";
44
@import "skeleton-loading";
5+
@import "flatpickr/dist/flatpickr";
6+
@import "flatpickr/dist/themes/airbnb";
57

68
$tag-hover-shadow: 0 2px 8px rgba(0 0 0 / 20%);
79

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"ember-data-resources": "^5.2.1",
5454
"ember-engines-router-service": "^0.5.1",
5555
"ember-fetch": "^8.1.2",
56-
"ember-flatpickr": "^4.0.0",
56+
"ember-flatpickr": "^7.1.0",
5757
"ember-intl": "^6.4.1",
5858
"ember-localized-model": "^3.2.2",
5959
"ember-modifier": "^4.1.0",
@@ -63,6 +63,7 @@
6363
"ember-truth-helpers": "^4.0.3",
6464
"ember-uikit": "^9.0.0",
6565
"file-saver": "^2.0.5",
66+
"flatpickr": "^4.6.13",
6667
"luxon": "^3.4.4"
6768
},
6869
"devDependencies": {

pnpm-lock.yaml

+13-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)