Merge remote-tracking branch 'origin/master' into jstrimpel-master

iamakulov · Mar 24, 2018 · 8a48df4 · 8a48df4
2 parents db20d52 + e2fc2ba
commit 8a48df4
Show file tree

Hide file tree

Showing 4 changed files with 8,064 additions and 7,088 deletions.
diff --git a/index.js b/index.js
@@ -50,7 +50,13 @@ function normalizeLocalesToKeep(localesToKeep) {
 
     // Check if has unknown locales
     var absentLocales = localesToKeep.filter(function(localeName) {
-        return moment.localeData(localeName) === null;
+        const localeData = moment.localeData(localeName);
+        return (
+            // For Moment 2.20.1−
+            localeData === null ||
+            // For Moment. 2.21.0+ – this version now returns a default locale instead of null
+            localeData === moment.localeData()
+        );
     });
     if (absentLocales.length > 0) {
         throw new Error(