From 356cab8e856dc0e1cb74c22358276261ed564b79 Mon Sep 17 00:00:00 2001 From: Volodymyr Tartynskyi Date: Thu, 8 Jan 2015 18:16:35 +0200 Subject: [PATCH 1/4] Update angular-moment.js updated changeLocale method in amMoment service so that it can accept Calendar strings customizations http://momentjs.com/docs/#/customization/calendar/ --- angular-moment.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/angular-moment.js b/angular-moment.js index d0d96c3..1c49fc4 100644 --- a/angular-moment.js +++ b/angular-moment.js @@ -297,9 +297,14 @@ * with the new locale. Also broadcasts a `amMoment:localeChanged` event on $rootScope. * * @param {string} locale 2-letter language code (e.g. en, es, ru, etc.) + * @param {object} values object of locale settings */ - this.changeLocale = function (locale) { - var result = (moment.locale || moment.lang)(locale); + this.changeLocale = function (locale, values) { + if (typeof(values) !== 'undefined') { + var result = (moment.locale || moment.lang)(locale, values); + } else { + var result = (moment.locale || moment.lang)(locale); + } if (angular.isDefined(locale)) { $rootScope.$broadcast('amMoment:localeChanged'); From 1ea0c77bc84c9c35409a09c3998707a9935d9f72 Mon Sep 17 00:00:00 2001 From: Volodymyr Tartynskyi Date: Thu, 8 Jan 2015 18:20:47 +0200 Subject: [PATCH 2/4] Update angular-moment.js fixed var declaration --- angular-moment.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/angular-moment.js b/angular-moment.js index 1c49fc4..21194be 100644 --- a/angular-moment.js +++ b/angular-moment.js @@ -300,10 +300,11 @@ * @param {object} values object of locale settings */ this.changeLocale = function (locale, values) { + var result; if (typeof(values) !== 'undefined') { - var result = (moment.locale || moment.lang)(locale, values); + result = (moment.locale || moment.lang)(locale, values); } else { - var result = (moment.locale || moment.lang)(locale); + result = (moment.locale || moment.lang)(locale); } if (angular.isDefined(locale)) { $rootScope.$broadcast('amMoment:localeChanged'); From 617d0b928a4e5b5ec678432986be97e9909a7eec Mon Sep 17 00:00:00 2001 From: Volodymyr Tartynskyi Date: Thu, 8 Jan 2015 18:36:14 +0200 Subject: [PATCH 3/4] Update tests.js Test addedd --- tests.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests.js b/tests.js index 3553578..29eccc8 100644 --- a/tests.js +++ b/tests.js @@ -533,7 +533,14 @@ describe('module angularMoment', function () { }); describe('amMoment service', function () { - describe('#changeLocale', function () { + it('should convert today date to custom calendar form', function () { + var today = new Date(); + amMoment.changeLocale('en', {calendar: {sameDay : '[Today]'}}); + var amCalendar = $filter('amCalendar'); + var testDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 13, 33, 33); + expect(amCalendar(testDate)).toBe('Today'); + }); + it('should return the current locale', function () { expect(amMoment.changeLocale()).toBe('en'); }); From d80936c8154c6dd403fa94ddf784736031b7decf Mon Sep 17 00:00:00 2001 From: Volodymyr Tartynskyi Date: Thu, 8 Jan 2015 18:56:30 +0200 Subject: [PATCH 4/4] Update tests.js Web editor is evil --- tests.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.js b/tests.js index 29eccc8..bdb1c04 100644 --- a/tests.js +++ b/tests.js @@ -533,6 +533,7 @@ describe('module angularMoment', function () { }); describe('amMoment service', function () { + describe('#changeLocale', function () { it('should convert today date to custom calendar form', function () { var today = new Date(); amMoment.changeLocale('en', {calendar: {sameDay : '[Today]'}});