]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
Reset the locale back to 'en' after defining all locales in min/locales.js
authorIskren Chernev <iskren.chernev@gmail.com>
Sat, 7 Nov 2015 20:24:49 +0000 (12:24 -0800)
committerIskren Chernev <iskren.chernev@gmail.com>
Mon, 9 Nov 2015 02:33:10 +0000 (18:33 -0800)
Fixes #1798

tasks/transpile.js

index d253407d1dc0bdebf57ee64a8bcc37bec51a6add..b9f8474751d176a6db26923ee5fc8321690c30ba 100644 (file)
@@ -105,7 +105,11 @@ module.exports = function (grunt) {
             code = files.map(function (file) {
                 var identifier = path.basename(file, '.js').replace('-', '_');
                 return 'import ' + identifier + ' from "./' + file + '";';
-            }).join('\n');
+            }).concat([
+                // Reset the language back to 'en', because every defineLocale
+                // also sets it.
+                'moment.locale(\'en\');'
+            ]).join('\n');
         return transpileCode({
             base: 'src',
             code: code,