Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(DatePicker): allow locale object to be passed in to flatpickr #7834

Merged
merged 3 commits into from
Feb 19, 2021
Merged

fix(DatePicker): allow locale object to be passed in to flatpickr #7834

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23edd71
fix(DatePicker): allow locale object to be passed in to flatpickr
tw15egan Feb 17, 2021
d6fae5b
chore(tests): update snapshots
tw15egan Feb 17, 2021
1fdff32
Merge branch 'master' into date-picker-update
kodiakhq[bot] Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 74 additions & 63 deletions packages/react/src/components/DatePicker/DatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,68 +161,71 @@ export default class DatePicker extends Component {
/**
* The language locale used to format the days of the week, months, and numbers. The full list of supported locales can be found here https://github.com/flatpickr/flatpickr/tree/master/src/l10n
*/
locale: PropTypes.oneOf([
'ar', // Arabic
'at', // Austria
'az', // Azerbaijan
'be', // Belarusian
'bg', // Bulgarian
'bn', // Bangla
'bs', // Bosnia
'cat', // Catalan
'cs', // Czech
'cy', // Welsh
'da', // Danish
'de', // German
'en', // English
'eo', // Esperanto
'es', // Spanish
'et', // Estonian
'fa', // Persian
'fi', // Finnish
'fo', // Faroese
'fr', // French
'ga', // Gaelic
'gr', // Greek
'he', // Hebrew
'hi', // Hindi
'hr', // Croatian
'hu', // Hungarian
'id', // Indonesian
'is', // Icelandic
'it', // Italian
'ja', // Japanese
'ka', // Georgian
'km', // Khmer
'ko', // Korean
'kz', // Kazakh
'lt', // Lithuanian
'lv', // Latvian
'mk', // Macedonian
'mn', // Mongolian
'ms', // Malaysian
'my', // Burmese
'nl', // Dutch
'no', // Norwegian
'pa', // Punjabi
'pl', // Polish
'pt', // Portuguese
'ro', // Romanian
'ru', // Russian
'si', // Sinhala
'sk', // Slovak
'sl', // Slovenian
'sq', // Albanian
'sr-cyr', // Serbian Cyrillic
'sr', // Serbian
'sv', // Swedish
'th', // Thai
'tr', // Turkish
'uk', // Ukrainian
'uz', // Uzbek
'vn', // Vietnamese
'zh-tw', // Mandarin Traditional
'zh', // Mandarin
locale: PropTypes.oneOfType([
PropTypes.object,
PropTypes.oneOf([
'ar', // Arabic
'at', // Austria
'az', // Azerbaijan
'be', // Belarusian
'bg', // Bulgarian
'bn', // Bangla
'bs', // Bosnia
'cat', // Catalan
'cs', // Czech
'cy', // Welsh
'da', // Danish
'de', // German
'en', // English
'eo', // Esperanto
'es', // Spanish
'et', // Estonian
'fa', // Persian
'fi', // Finnish
'fo', // Faroese
'fr', // French
'ga', // Gaelic
'gr', // Greek
'he', // Hebrew
'hi', // Hindi
'hr', // Croatian
'hu', // Hungarian
'id', // Indonesian
'is', // Icelandic
'it', // Italian
'ja', // Japanese
'ka', // Georgian
'km', // Khmer
'ko', // Korean
'kz', // Kazakh
'lt', // Lithuanian
'lv', // Latvian
'mk', // Macedonian
'mn', // Mongolian
'ms', // Malaysian
'my', // Burmese
'nl', // Dutch
'no', // Norwegian
'pa', // Punjabi
'pl', // Polish
'pt', // Portuguese
'ro', // Romanian
'ru', // Russian
'si', // Sinhala
'sk', // Slovak
'sl', // Slovenian
'sq', // Albanian
'sr-cyr', // Serbian Cyrillic
'sr', // Serbian
'sv', // Swedish
'th', // Thai
'tr', // Turkish
'uk', // Ukrainian
'uz', // Uzbek
'vn', // Vietnamese
'zh-tw', // Mandarin Traditional
'zh', // Mandarin
]),
]),

/**
Expand Down Expand Up @@ -292,6 +295,14 @@ export default class DatePicker extends Component {
this.updateClassNames(instance);
};

let localeData;
if (typeof locale === 'object') {
let location = locale.locale ? locale.locale : 'en';
localeData = { ...l10n[location], ...locale };
} else {
localeData = l10n[locale];
}

// inputField ref might not be set in enzyme tests
if (this.inputField) {
this.cal = new flatpickr(this.inputField, {
Expand All @@ -300,7 +311,7 @@ export default class DatePicker extends Component {
mode: datePickerType,
allowInput: allowInput ?? true,
dateFormat: dateFormat,
locale: l10n[locale],
locale: localeData,
minDate: minDate,
maxDate: maxDate,
plugins: [
Expand Down