From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Sat, 7 Nov 2015 20:24:49 +0000 (-0800)
Subject: Reset the locale back to 'en' after defining all locales in min/locales.js
X-Git-Tag: 2.11.0~67^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be047bce84afed778bf77f9108a6a6f6a2ca89a;p=thirdparty%2Fmoment.git

Reset the locale back to 'en' after defining all locales in min/locales.js

Fixes #1798
---

diff --git a/tasks/transpile.js b/tasks/transpile.js
index d253407d1..b9f847475 100644
--- a/tasks/transpile.js
+++ b/tasks/transpile.js
@@ -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,