From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Sat, 18 Mar 2017 20:24:47 +0000 (+0200)
Subject: Revert "Merge pull request #3786 from netguru:develop"
X-Git-Tag: 2.18.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cd97f2d7af848113987339ff228b5b9b29af908;p=thirdparty%2Fmoment.git

Revert "Merge pull request #3786 from netguru:develop"

This reverts commit b1862fd5041e7bbdaf6f62b159e0944ab21e3dc0, reversing
changes made to a3ab61646cf3c4e5a41a75d0843b26755ca4498a.
---

diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index a26ffe0f3..99ee11571 100644
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -47,9 +47,6 @@ function chooseLocale(names) {
 
 function loadLocale(name) {
     var oldLocale = null;
-    if (name === 'default' && typeof window !== 'undefined') {
-        name = window.navigator.userLanguage || window.navigator.language;
-    }
     // TODO: Find a better way to register and load all the locales in Node
     if (!locales[name] && (typeof module !== 'undefined') &&
             module && module.exports) {
diff --git a/src/test/moment/locale.js b/src/test/moment/locale.js
index c992c1197..186c649df 100644
--- a/src/test/moment/locale.js
+++ b/src/test/moment/locale.js
@@ -66,57 +66,6 @@ test('library getters and setters', function (assert) {
     assert.equal(moment.locale(), 'en-gb', 'Normalize locale key underscore');
 });
 
-test('\'default\' locale', function (assert) {
-    var oldWindow = global.window;
-    try {
-        moment.locale('default');
-        assert.equal(moment.locale(), 'en', 'default locale should return en on node');
-
-        // simulating window on node (normally avaliable only in a browser)
-        global.window = {
-            navigator: {
-                language: 'wrong-locale',
-                userLanguage: 'fr'
-            }
-        };
-
-        moment.locale('default');
-        assert.equal(moment.locale(), 'fr', 'default locale should return locale from window.navigator.userLanguage first on browser');
-
-        global.window = {
-            navigator: {
-                language: undefined,
-                userLanguage: 'fr'
-            }
-        };
-
-        moment.locale('default');
-        assert.equal(moment.locale(), 'fr', 'default locale should return locale from window.navigator.userLanguage first on browser');
-
-        global.window = {
-            navigator: {
-                language: 'fr',
-                userLanguage: undefined
-            }
-        };
-
-        moment.locale('default');
-        assert.equal(moment.locale(), 'fr', 'default locale should return locale from window.navigator.language second on browser');
-
-        global.window = {
-            navigator: {
-                language: 'wrong-locale',
-                userLanguage: 'wrong-locale'
-            }
-        };
-
-        moment.locale('default');
-        assert.equal(moment.locale(), 'fr', 'default locale should return en if a browser provides unknown locale');
-    } finally {
-        global.window = oldWindow;
-    }
-});
-
 test('library setter array of locales', function (assert) {
     assert.equal(moment.locale(['non-existent', 'fr', 'also-non-existent']), 'fr', 'passing an array uses the first valid locale');
     assert.equal(moment.locale(['es', 'fr', 'also-non-existent']), 'es', 'passing an array uses the first valid locale');