From: Marius Gundersen Date: Mon, 30 Sep 2013 12:10:54 +0000 (+0200) Subject: return the name of the language which was registered X-Git-Tag: 2.3.0~14^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e544ea8667d0aae9ee478c906e914d85da0bfb71;p=thirdparty%2Fmoment.git return the name of the language which was registered --- diff --git a/moment.js b/moment.js index 4a4e7fa36..8957b5188 100644 --- a/moment.js +++ b/moment.js @@ -1360,6 +1360,7 @@ getLangDefinition(key); } moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); + return key; }; // returns language data diff --git a/test/moment/lang.js b/test/moment/lang.js index 74942171a..a62c880b0 100644 --- a/test/moment/lang.js +++ b/test/moment/lang.js @@ -237,6 +237,16 @@ exports.lang = { test.equal(moment('2012-01-01 3b', 'YYYY-MM-DD ha').hour(), 15, 'Custom parsing of meridiem should work'); test.equal(moment('2012-01-01 3d', 'YYYY-MM-DD ha').hour(), 3, 'Custom parsing of meridiem should work'); + test.done(); + }, + + "return lang name" : function (test) { + test.expect(1); + + var registered = moment.lang('return-this', {}); + + test.equal(registered, 'return-this', 'returns the language configured'); + test.done(); } };