v1.3.19 - Prevent error on missing locale

deskpro · Apr 3, 2018 · 38c9dba · 38c9dba
1 parent bab772d
commit 38c9dba
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
-## v1.3.18 - 2017-03-21
+## v1.3.19 - 2018-04-03
+
+* Prevent error on missing locale
+
+## v1.3.18 - 2018-03-21
 
 * Adds prepublish script
 
-## v1.3.17 - 2017-03-21
+## v1.3.17 - 2018-03-21
 
 * Fix click on SelectableList
 

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deskpro/react-components",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "Deskpro React Components",
   "main": "dist/index.js",
   "homepage": "https://github.com/deskpro/react-components",

diff --git a/src/Components/Forms/Datepicker.jsx b/src/Components/Forms/Datepicker.jsx
@@ -105,7 +105,12 @@ export default class Datepicker extends React.Component {
       this.format += ' HH:mm';
     }
 
-    this.firstWeekDay = moment.localeData(props.locale).firstDayOfWeek();
+    const localeData = moment.localeData(props.locale);
+    if (localeData) {
+      this.firstWeekDay = moment.localeData(props.locale).firstDayOfWeek();
+    } else {
+      this.firstWeekDay = 0;
+    }
 
     if (props.value) {
       const momentDate = moment(props.value, this.format);