fix(locale): make the locale fix backward compatible with older angul…

…ar-moment versions (close #70 #71 76)
urish · Sep 7, 2014 · 68affb9 · 68affb9
1 parent f7146be
commit 68affb9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/angular-moment.js b/angular-moment.js
@@ -265,7 +265,7 @@
 				 * @param {string} lang 2-letter language code (e.g. en, es, ru, etc.)
 				 */
 				this.changeLocale = function (lang) {
-					var result = moment.locale(lang);
+					var result = (moment.locale||moment.lang)(lang);
 					if (angular.isDefined(lang)) {
 						$rootScope.$broadcast('amMoment:languageChange');
 					}

diff --git a/karma.conf.js b/karma.conf.js
@@ -15,7 +15,7 @@ module.exports = function (config) {
 		files: [
 			'bower_components/angular/angular.js',
 			'bower_components/moment/moment.js',
-			'bower_components/moment/locale/fr.js',
+			'bower_components/moment/{locale,lang}/fr.js',
 			'bower_components/moment-timezone/moment-timezone.js',
 			'angular-moment.js',