Merge branch 'patch-1' of https://github.com/vosi/angular-moment into…

… vosi-patch-1

Conflicts:
	angular-moment.js

close #102

angular-moment.js

@@ -296,9 +296,10 @@
 				 * with the new locale. Also broadcasts a `amMoment:localeChanged` event on $rootScope.
 				 *
 				 * @param {string} locale Locale code (e.g. en, es, ru, pt-br, etc.)
+				 * @param {object} values object of locale settings
 				 */
-				this.changeLocale = function (locale) {
-					var result = moment.locale(locale);
+				this.changeLocale = function (locale, values) {
+					var result = moment.locale(locale, values);
 					if (angular.isDefined(locale)) {
 						$rootScope.$broadcast('amMoment:localeChanged');
 

tests.js

@@ -534,6 +534,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');
 			});