openstack/deb-horizon
Code Issues Proposed changes

Enable no-redeclare

Browse Source 
This enables the no-redeclare linting rule from eslint-config-openstack,
and corrects any errors found.

Change-Id: I2835b3ee9e20b735901315aa19919eb810cf5b75
This commit is contained in:
Michael Krotscheck 2015-11-23 10:37:44 -08:00
parent 4e52904000
commit c6c7110a9c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc
View File

@ -32,7 +32,6 @@ rules:
callback-return: 1
guard-for-in: 1
block-scoped-var: 1
no-redeclare: 1
no-new: 1
#############################################################################

5
horizon/static/framework/util/filters/filters.js
View File

@ -198,13 +198,14 @@
}
return function (input, totalInput) {
var format;
var count = ensureNonNegative(input);
if (angular.isUndefined(totalInput)) {
var format = ngettext('Displaying %s item', 'Displaying %s items', count);
format = ngettext('Displaying %s item', 'Displaying %s items', count);
return interpolate(format, [count]);
} else {
var total = ensureNonNegative(totalInput);
var format = gettext('Displaying %(count)s of %(total)s items');
format = gettext('Displaying %(count)s of %(total)s items');
return interpolate(format, {count: count, total: total}, true);
}
};