Merge pull request moment#346 from cgbeekman/b74a212203c2ba94b26163ff…

…4942a9885e322fd7 Month abbreviation improvements for language nl
qmmr · Jul 5, 2012 · 17a4d26 · 17a4d26
2 parents 5705302 + 698f38f
commit 17a4d26
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/lang/nl.js b/lang/nl.js
@@ -2,9 +2,17 @@
 // language : dutch (nl)
 // author : Joris Röling : https://github.com/jjupiter
 (function () {
+    var monthsShortWithDots = "jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_");
+    var monthsShortWithoutDots = "jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_");
     var lang = {
             months : "januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),
-            monthsShort : "jan._feb._mar._apr._mei._jun._jul._aug._sep._okt._nov._dec.".split("_"),
+            monthsShort : function (m, format) {
+                if (/-MMM-/.test(format)) {
+                    return monthsShortWithoutDots[m.month()];
+                } else {
+                    return monthsShortWithDots[m.month()];
+                }
+            },
             weekdays : "zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),
             weekdaysShort : "zo._ma._di._wo._do._vr._za.".split("_"),
             weekdaysMin : "Zo_Ma_Di_Wo_Do_Vr_Za".split("_"),

diff --git a/test/lang/nl.js b/test/lang/nl.js
@@ -9,7 +9,7 @@ exports["lang:nl"] = {
     "parse" : function(test) {
         test.expect(96);
         moment.lang('nl');
-        var tests = 'januari jan._februari feb._maart mar._april apr._mei mei._juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split("_");
+        var tests = 'januari jan._februari feb._maart mrt._april apr._mei mei._juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split("_");
         var i;
         function equalTest(input, mmm, i) {
             test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
@@ -102,7 +102,7 @@ exports["lang:nl"] = {
     "format month" : function(test) {
         test.expect(12);
         moment.lang('nl');
-        var expected = 'januari jan._februari feb._maart mar._april apr._mei mei._juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split("_");
+        var expected = 'januari jan._februari feb._maart mrt._april apr._mei mei_juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split("_");
         var i;
         for (i = 0; i < expected.length; i++) {
             test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
@@ -244,5 +244,15 @@ exports["lang:nl"] = {
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
     test.done();
+    },
+
+    "month abbreviation" : function(test) {
+        test.expect(2);
+        moment.lang('nl');
+
+        test.equal(moment([2012, 5, 23]).format('D-MMM-YYYY'), '23-jun-2012', 'format month abbreviation surrounded by dashes should not include a dot');
+        test.equal(moment([2012, 5, 23]).format('D MMM YYYY'), '23 jun. 2012', 'format month abbreviation not surrounded by dashes should include a dot');
+
+        test.done();
     }
 };