From faeb903108f1f6887c0feb4b8184134edb8293f3 Mon Sep 17 00:00:00 2001 From: Iskren Chernev Date: Fri, 9 Aug 2013 02:02:36 -0700 Subject: [PATCH] Normalize language identifiers as described in #963 --- moment.js | 2 ++ test/moment/lang.js | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/moment.js b/moment.js index 520b5b905..fe9df98a1 100644 --- a/moment.js +++ b/moment.js @@ -1137,6 +1137,8 @@ if (!key) { return moment.fn._lang._abbr; } + key = key.toLowerCase(); + key = key.replace('_', '-'); if (values) { loadLang(key, values); } else if (values === null) { diff --git a/test/moment/lang.js b/test/moment/lang.js index ee0cb5e2f..74942171a 100644 --- a/test/moment/lang.js +++ b/test/moment/lang.js @@ -2,7 +2,7 @@ var moment = require("../../moment"); exports.lang = { "library getter" : function (test) { - test.expect(5); + test.expect(7); moment.lang('en'); test.equal(moment.lang(), 'en', 'Lang should return en by default'); @@ -19,6 +19,12 @@ exports.lang = { moment.lang('does-not-exist'); test.equal(moment.lang(), 'en', 'Lang should reset'); + moment.lang('EN'); + test.equal(moment.lang(), 'en', 'Normalize language key case'); + + moment.lang('EN_gb'); + test.equal(moment.lang(), 'en-gb', 'Normalize language key underscore'); + test.done(); }, -- 2.47.2