From 6c36cbd2b549233da5c5fb40a6d4127f5c0b8dc9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 10 Feb 2013 18:29:57 -0600 Subject: [PATCH] Capitalize 'Last' when referring to last week 'Today', 'Yesterday', etc. were capitalized while 'last' was not, which seems very inconsistent. Capitalize 'Last' in all English locales. --- lang/en-ca.js | 2 +- lang/en-gb.js | 2 +- moment.js | 2 +- test/lang/en-ca.js | 6 +++--- test/lang/en-gb.js | 6 +++--- test/lang/en.js | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lang/en-ca.js b/lang/en-ca.js index b432298ad..51bb2b9f1 100644 --- a/lang/en-ca.js +++ b/lang/en-ca.js @@ -20,7 +20,7 @@ require('../moment').lang('en-ca', { nextDay : '[Tomorrow at] LT', nextWeek : 'dddd [at] LT', lastDay : '[Yesterday at] LT', - lastWeek : '[last] dddd [at] LT', + lastWeek : '[Last] dddd [at] LT', sameElse : 'L' }, relativeTime : { diff --git a/lang/en-gb.js b/lang/en-gb.js index 98bc95be5..c880627bb 100644 --- a/lang/en-gb.js +++ b/lang/en-gb.js @@ -20,7 +20,7 @@ require('../moment').lang('en-gb', { nextDay : '[Tomorrow at] LT', nextWeek : 'dddd [at] LT', lastDay : '[Yesterday at] LT', - lastWeek : '[last] dddd [at] LT', + lastWeek : '[Last] dddd [at] LT', sameElse : 'L' }, relativeTime : { diff --git a/moment.js b/moment.js index 9ff57aace..06e8d5139 100644 --- a/moment.js +++ b/moment.js @@ -424,7 +424,7 @@ nextDay : '[Tomorrow at] LT', nextWeek : 'dddd [at] LT', lastDay : '[Yesterday at] LT', - lastWeek : '[last] dddd [at] LT', + lastWeek : '[Last] dddd [at] LT', sameElse : 'L' }, calendar : function (key, mom) { diff --git a/test/lang/en-ca.js b/test/lang/en-ca.js index 6e719eed1..b7af6f93b 100644 --- a/test/lang/en-ca.js +++ b/test/lang/en-ca.js @@ -245,11 +245,11 @@ exports["lang:en-ca"] = { for (i = 2; i < 7; i++) { m = moment().subtract({ d: i }); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days current time"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days current time"); m.hours(0).minutes(0).seconds(0).milliseconds(0); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days beginning of day"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days beginning of day"); m.hours(23).minutes(59).seconds(59).milliseconds(999); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days end of day"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days end of day"); } test.done(); }, diff --git a/test/lang/en-gb.js b/test/lang/en-gb.js index 88f606d5c..2c9420bb7 100644 --- a/test/lang/en-gb.js +++ b/test/lang/en-gb.js @@ -225,11 +225,11 @@ exports["lang:en-gb"] = { for (i = 2; i < 7; i++) { m = moment().subtract({ d: i }); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days current time"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days current time"); m.hours(0).minutes(0).seconds(0).milliseconds(0); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days beginning of day"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days beginning of day"); m.hours(23).minutes(59).seconds(59).milliseconds(999); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days end of day"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days end of day"); } test.done(); }, diff --git a/test/lang/en.js b/test/lang/en.js index d4e203e51..163346149 100644 --- a/test/lang/en.js +++ b/test/lang/en.js @@ -246,11 +246,11 @@ exports["lang:en"] = { for (i = 2; i < 7; i++) { m = moment().subtract({ d: i }); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days current time"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days current time"); m.hours(0).minutes(0).seconds(0).milliseconds(0); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days beginning of day"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days beginning of day"); m.hours(23).minutes(59).seconds(59).milliseconds(999); - test.equal(m.calendar(), m.format('[last] dddd [at] LT'), "Today - " + i + " days end of day"); + test.equal(m.calendar(), m.format('[Last] dddd [at] LT'), "Today - " + i + " days end of day"); } test.done(); }, -- 2.47.2