From c705bff3a86fd27cdaa6ecee99d852963b202e0e Mon Sep 17 00:00:00 2001 From: Jeff Potter Date: Tue, 6 Oct 2015 21:58:48 -0600 Subject: [PATCH 1/6] adding more uncountable words --- pluralize.js | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pluralize.js b/pluralize.js index 4ef4eb6..3f810f4 100644 --- a/pluralize.js +++ b/pluralize.js @@ -359,16 +359,51 @@ */ [ // Singular words with no plurals. + 'access', + 'accommodation', + 'adulthood', + 'advertising', 'advice', 'agenda', + 'aggression', + 'alcohol', + 'ammo', + 'anger', + 'applause', + 'arithmetic', + 'art', + 'assistance', + 'athletics', + 'attention', + 'baggage', + 'ballet', + 'beauty', + 'beef', + 'beer', + 'biology', 'bison', + 'blood', + 'botany', 'bream', 'buffalo', + 'butter', 'carp', + 'cash', 'chassis', + 'cheese', + 'chess', + 'childhood', + 'clothing', + 'coal', 'cod', + 'coffee', + 'commerce', + 'content', 'cooperation', 'corps', + 'currency', + 'damage', + 'danger', 'digestion', 'debris', 'diabetes', From 0e19a86c7f429a90fd2066876416923ffb3bdd12 Mon Sep 17 00:00:00 2001 From: Jeff Potter Date: Tue, 6 Oct 2015 22:06:00 -0600 Subject: [PATCH 2/6] adding additional uncountable words, fixing tests --- pluralize.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pluralize.js b/pluralize.js index 3f810f4..0cf0cac 100644 --- a/pluralize.js +++ b/pluralize.js @@ -366,6 +366,7 @@ 'advice', 'agenda', 'aggression', + 'aid', 'alcohol', 'ammo', 'anger', @@ -376,8 +377,6 @@ 'athletics', 'attention', 'baggage', - 'ballet', - 'beauty', 'beef', 'beer', 'biology', @@ -390,19 +389,12 @@ 'carp', 'cash', 'chassis', - 'cheese', - 'chess', 'childhood', 'clothing', - 'coal', 'cod', - 'coffee', - 'commerce', 'content', 'cooperation', 'corps', - 'currency', - 'damage', 'danger', 'digestion', 'debris', @@ -421,16 +413,19 @@ 'herpes', 'highjinks', 'homework', + 'importance', 'information', 'jeans', 'justice', 'kudos', 'labour', + 'literature', 'machinery', 'mackerel', 'media', 'mews', 'moose', + 'music', 'news', 'pike', 'plankton', @@ -438,6 +433,7 @@ 'pollution', 'premises', 'rain', + 'research', 'rice', 'salmon', 'scissors', @@ -449,7 +445,11 @@ 'staff', 'swine', 'trout', + 'traffic', + 'transporation', 'tuna', + 'wealth', + 'welfare', 'whiting', 'wildebeest', 'wildlife', From 569b5c70a2d61a03c1645951eac84de455a0d072 Mon Sep 17 00:00:00 2001 From: Jeff Potter Date: Thu, 15 Oct 2015 00:25:05 -0600 Subject: [PATCH 3/6] Removed some words --- pluralize.js | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/pluralize.js b/pluralize.js index 0cf0cac..e32687d 100644 --- a/pluralize.js +++ b/pluralize.js @@ -358,53 +358,27 @@ * Uncountable rules. */ [ + // Check with https://en.wiktionary.org/wiki/{{word}} // Singular words with no plurals. - 'access', - 'accommodation', - 'adulthood', - 'advertising', - 'advice', 'agenda', - 'aggression', - 'aid', - 'alcohol', 'ammo', - 'anger', - 'applause', - 'arithmetic', - 'art', - 'assistance', 'athletics', - 'attention', - 'baggage', - 'beef', - 'beer', - 'biology', 'bison', - 'blood', - 'botany', 'bream', 'buffalo', - 'butter', 'carp', 'cash', 'chassis', - 'childhood', 'clothing', - 'cod', - 'content', 'cooperation', 'corps', - 'danger', 'digestion', 'debris', 'diabetes', - 'energy', - 'equipment', - 'elk', 'excretion', 'expertise', 'flounder', + 'fun', 'gallows', 'garbage', 'graffiti', @@ -413,7 +387,7 @@ 'herpes', 'highjinks', 'homework', - 'importance', + 'housework', 'information', 'jeans', 'justice', From 65431db637480ceeca60cba93cb5862284243095 Mon Sep 17 00:00:00 2001 From: Jeff Potter Date: Thu, 15 Oct 2015 00:25:24 -0600 Subject: [PATCH 4/6] removing comment for source --- pluralize.js | 1 - 1 file changed, 1 deletion(-) diff --git a/pluralize.js b/pluralize.js index e32687d..3097e6d 100644 --- a/pluralize.js +++ b/pluralize.js @@ -358,7 +358,6 @@ * Uncountable rules. */ [ - // Check with https://en.wiktionary.org/wiki/{{word}} // Singular words with no plurals. 'agenda', 'ammo', From 9ded9cdc6026633399d9429f6541393d73310ff8 Mon Sep 17 00:00:00 2001 From: Jeff Potter Date: Fri, 16 Oct 2015 23:23:15 -0600 Subject: [PATCH 5/6] Suggested additions. --- pluralize.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pluralize.js b/pluralize.js index 3097e6d..3e845f7 100644 --- a/pluralize.js +++ b/pluralize.js @@ -359,16 +359,23 @@ */ [ // Singular words with no plurals. + 'adulthood', 'agenda', + 'aid', + 'alcohol', 'ammo', 'athletics', 'bison', + 'blood', 'bream', 'buffalo', + 'butter', 'carp', 'cash', 'chassis', + 'chess', 'clothing', + 'commerce', 'cooperation', 'corps', 'digestion', From bb03ea3f750531b36bc936a2bd7305ad390419df Mon Sep 17 00:00:00 2001 From: Jeff Potter Date: Fri, 16 Oct 2015 23:26:09 -0600 Subject: [PATCH 6/6] I can't forget about the Elk and cod. That should make only additions. --- pluralize.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pluralize.js b/pluralize.js index 3e845f7..81b0f30 100644 --- a/pluralize.js +++ b/pluralize.js @@ -359,6 +359,7 @@ */ [ // Singular words with no plurals. + 'advice', 'adulthood', 'agenda', 'aid', @@ -376,11 +377,15 @@ 'chess', 'clothing', 'commerce', + 'cod', 'cooperation', 'corps', 'digestion', 'debris', 'diabetes', + 'energy', + 'equipment', + 'elk', 'excretion', 'expertise', 'flounder',