Skip to content

Commit

Permalink
fix(ngPluralize): fixes ng-pluralize when using non-standard start/en…
Browse files Browse the repository at this point in the history
…d symbols

Closes angular#1134
  • Loading branch information
btford authored and IgorMinar committed Aug 11, 2012
1 parent b56b1f7 commit f7f4026
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/ng/directive/ngPluralize.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,14 @@ var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interp
whenExp = element.attr(attr.$attr.when), // this is because we have {{}} in attrs
offset = attr.offset || 0,
whens = scope.$eval(whenExp),
whensExpFns = {};
whensExpFns = {},
startSymbol = $interpolate.startSymbol(),
endSymbol = $interpolate.endSymbol();

forEach(whens, function(expression, key) {
whensExpFns[key] =
$interpolate(expression.replace(BRACE, '{{' + numberExp + '-' + offset + '}}'));
$interpolate(expression.replace(BRACE, startSymbol + numberExp + '-' +
offset + endSymbol));
});

scope.$watch(function() {
Expand Down
37 changes: 37 additions & 0 deletions test/ng/directive/ngPluralizeSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,41 @@ describe('ngPluralize', function() {
expect(element.text()).toBe('Igor, Misko and 2 other people are viewing.');
}));
});


describe('interpolation', function() {

it('should support custom interpolation symbols', function() {
module(function($interpolateProvider) {
$interpolateProvider.startSymbol('[[').endSymbol('%%');
});

inject(function($compile, $rootScope) {
element = $compile(
"<ng:pluralize count=\"viewCount\" offset=\"1\"" +
"when=\"{'0': 'Nobody is viewing.'," +
"'1': '[[p1%% is viewing.'," +
"'one': '[[p1%% and one other person are viewing.'," +
"'other': '[[p1%% and {} other people are viewing.'}\">" +
"</ng:pluralize>")($rootScope);
$rootScope.p1 = 'Igor';

$rootScope.viewCount = 0;
$rootScope.$digest();
expect(element.text()).toBe('Nobody is viewing.');

$rootScope.viewCount = 1;
$rootScope.$digest();
expect(element.text()).toBe('Igor is viewing.');

$rootScope.viewCount = 2;
$rootScope.$digest();
expect(element.text()).toBe('Igor and one other person are viewing.');

$rootScope.viewCount = 3;
$rootScope.$digest();
expect(element.text()).toBe('Igor and 2 other people are viewing.');
});
})
});
});

1 comment on commit f7f4026

@mhevery
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Please sign in to comment.