Skip to content

Commit

Permalink
fix(ngTranslationFilter): angular v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
a8m committed Oct 21, 2014
1 parent a1fb975 commit 8931827
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/ngTranslationFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
angular.module('ng-translation.filter', [ 'ng-translation.provider' ])
.filter('translate', ['$parse', '$interpolate', 'ngTranslation', function($parse, $interpolate, ngTranslation) {

return function(string) {
var translateFilter = function(string) {

var args = Array.prototype.slice.call(arguments, 1);
var funcName = isString(args[0]) ? 'get' : 'getUsed';
Expand All @@ -24,13 +24,17 @@ angular.module('ng-translation.filter', [ 'ng-translation.provider' ])
return res || string;
//if the first argument is an object
} else if(isObject(args[0])) {
return $interpolate(res)(args[0])
return $interpolate(res)(args[0] || {})
}
//the first arguments is a string
//check if it should be interpolate
return isObject(args[1])
? $interpolate(res)(args[1])
? $interpolate(res)(args[1] || {})
: res
}
};

translateFilter.$stateful = true;

return translateFilter;

}]);

0 comments on commit 8931827

Please sign in to comment.