From: JD Isaacks <jd@jisaacks.com>
Date: Sun, 31 Jan 2016 21:34:25 +0000 (-0500)
Subject: List loaded locales
X-Git-Tag: 2.12.0~13^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb9917043f74a8bb3312c6e49992f7be836be679;p=thirdparty%2Fmoment.git

List loaded locales
---

diff --git a/src/lib/locale/locale.js b/src/lib/locale/locale.js
index 9657a5b58..ac9cebfb8 100644
--- a/src/lib/locale/locale.js
+++ b/src/lib/locale/locale.js
@@ -5,7 +5,8 @@ import {
     getSetGlobalLocale,
     defineLocale,
     updateLocale,
-    getLocale
+    getLocale,
+    listLocales
 } from './locales';
 
 import {
@@ -21,6 +22,7 @@ export {
     defineLocale,
     updateLocale,
     getLocale,
+    listLocales,
     listMonths,
     listMonthsShort,
     listWeekdays,
diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index 64eebd3ea..b2386064b 100644
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -157,3 +157,7 @@ export function getLocale (key) {
 
     return chooseLocale(key);
 }
+
+export function listLocales() {
+    return Object.keys(locales);
+}
diff --git a/src/moment.js b/src/moment.js
index df9afa81f..e4eed1013 100644
--- a/src/moment.js
+++ b/src/moment.js
@@ -26,6 +26,7 @@ import {
     updateLocale,
     getSetGlobalLocale as locale,
     getLocale          as localeData,
+    listLocales        as locales,
     listMonths         as months,
     listMonthsShort    as monthsShort,
     listWeekdays       as weekdays,
@@ -65,6 +66,7 @@ moment.monthsShort           = monthsShort;
 moment.weekdaysMin           = weekdaysMin;
 moment.defineLocale          = defineLocale;
 moment.updateLocale          = updateLocale;
+moment.locales               = locales;
 moment.weekdaysShort         = weekdaysShort;
 moment.normalizeUnits        = normalizeUnits;
 moment.relativeTimeThreshold = relativeTimeThreshold;
diff --git a/src/test/moment/locale.js b/src/test/moment/locale.js
index ef8ccbcf1..aee174749 100644
--- a/src/test/moment/locale.js
+++ b/src/test/moment/locale.js
@@ -152,6 +152,10 @@ test('defineLocale', function (assert) {
     assert.equal(moment().locale('dude').locale(), 'dude', 'defineLocale defines a locale');
 });
 
+test('locales', function (assert) {
+    assert.equal(moment.locales().length > 0, true, 'locales returns an array of defined locales');
+});
+
 test('library convenience', function (assert) {
     moment.locale('something', {week: {dow: 3}});
     moment.locale('something');