Merge pull request #96 from HeroicEric/correctly-pluralize-floats

Correctly pluralize floats between 1 and 2
emberjs · Dec 8, 2015 · 9a742cf · 9a742cf
2 parents 4d6aa7b + 2bfa456
commit 9a742cf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/addon/lib/helpers/pluralize.js b/addon/lib/helpers/pluralize.js
@@ -19,7 +19,7 @@ import makeHelper from '../utils/make-helper';
  * @param {String|Property} word word to pluralize
 */
 export default makeHelper(function (params) {
-  var count, word;
+  let count, word;
 
   if (params.length === 1) {
     word = params[0];
@@ -28,9 +28,10 @@ export default makeHelper(function (params) {
     count = params[0];
     word  = params[1];
 
-    if ((count | 0) !== 1) {
+    if (parseFloat(count) !== 1) {
       word = pluralize(word);
     }
+
     return count + " " + word;
   }
 });
diff --git a/tests/unit/inflector-test.js b/tests/unit/inflector-test.js
@@ -540,4 +540,3 @@ test('Ember.Inflector.singularize passes same test cases as ActiveSupport::Infle
   assert.equal(inflector.singularize('slices'), 'slice');
   assert.equal(inflector.singularize('police'), 'police');
 });
-
diff --git a/tests/unit/integration-test.js b/tests/unit/integration-test.js
@@ -56,13 +56,34 @@ test("helpers - pluralize - bound count 1", function(assert) {
   assert.equal(this.$().text(), '1 orange');
 });
 
+test("helpers - pluralize - bound count 1.0 float", function(assert) {
+  this.set('count', 1.0);
+  this.set('singular', 'owl');
+  this.render('{{pluralize count singular}}');
+  assert.equal(this.$().text(), '1 owl');
+});
+
+test("helpers - pluralize - bound count 1.5 float", function(assert) {
+  this.set('count', 1.5);
+  this.set('singular', 'owl');
+  this.render('{{pluralize count singular}}');
+  assert.equal(this.$().text(), '1.5 owls');
+});
+
 test("helpers - pluralize - bound count 1.0 string", function(assert) {
   this.set('count', '1.0');
   this.set('singular', 'owl');
   this.render('{{pluralize count singular}}');
   assert.equal(this.$().text(), '1.0 owl');
 });
 
+test("helpers - pluralize - bound count 1.5 string", function(assert) {
+  this.set('count', '1.5');
+  this.set('singular', 'owl');
+  this.render('{{pluralize count singular}}');
+  assert.equal(this.$().text(), '1.5 owls');
+});
+
 test("helpers - pluralize - bound count 2", function(assert) {
   this.set('count', 2);
   this.set('singular', 'omnivore');