From cf92071deee4d915fb36152e6cd4a2f0b010a06a Mon Sep 17 00:00:00 2001 From: Damien Van Der Windt Date: Thu, 27 Jul 2017 12:47:29 -0400 Subject: [PATCH 1/2] Stopped the pluralization of collection name --- package.json | 1 - src/components/AppHeader/AppHeader.js | 3 +-- src/components/UnpublishedListing/UnpublishedListing.js | 3 +-- src/containers/App.js | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e44623be91a8..4c6763b9ef2e 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,6 @@ "moment": "^2.11.2", "netlify-auth-js": "^0.5.5", "normalize.css": "^4.2.0", - "pluralize": "^3.0.0", "preliminaries": "1.1.0", "preliminaries-parser-toml": "1.1.0", "preliminaries-parser-yaml": "1.1.0", diff --git a/src/components/AppHeader/AppHeader.js b/src/components/AppHeader/AppHeader.js index 4746909907ec..db42bd3b55b9 100644 --- a/src/components/AppHeader/AppHeader.js +++ b/src/components/AppHeader/AppHeader.js @@ -1,6 +1,5 @@ import React, { PropTypes } from "react"; import ImmutablePropTypes from "react-immutable-proptypes"; -import pluralize from "pluralize"; import { IndexLink } from "react-router"; import { IconMenu, Menu, MenuItem } from "react-toolbox/lib/menu"; import Avatar from "react-toolbox/lib/avatar"; @@ -81,7 +80,7 @@ export default class AppHeader extends React.Component { key={collection.get("name")} value={collection.get("name")} onClick={this.handleCreatePostClick.bind(this, collection.get('name'))} // eslint-disable-line - caption={pluralize(collection.get("label"), 1)} + caption={collection.get("label")} /> ) } diff --git a/src/components/UnpublishedListing/UnpublishedListing.js b/src/components/UnpublishedListing/UnpublishedListing.js index 4f061d72bef3..b151b3f61490 100644 --- a/src/components/UnpublishedListing/UnpublishedListing.js +++ b/src/components/UnpublishedListing/UnpublishedListing.js @@ -3,7 +3,6 @@ import { DragSource, DropTarget, HTML5DragDrop } from 'react-simple-dnd'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { Link } from 'react-router'; import moment from 'moment'; -import pluralize from 'pluralize'; import { capitalize } from 'lodash' import { Card, CardTitle, CardText, CardActions } from 'react-toolbox/lib/card'; import Button from 'react-toolbox/lib/button'; @@ -82,7 +81,7 @@ class UnpublishedListing extends React.Component {
this.handleLinkClick(e, navigateToCollection, collectionName)} > - {pluralize(collection.get('label'))} + {collection.get('label')} { collection.get('create') ? ( From c389419a9b77cb1cf105796133964ad30f92fe6c Mon Sep 17 00:00:00 2001 From: Damien Van Der Windt Date: Thu, 27 Jul 2017 13:45:41 -0400 Subject: [PATCH 2/2] fixed mistake where pluralize and capitalize were inverted --- src/components/UnpublishedListing/UnpublishedListing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/UnpublishedListing/UnpublishedListing.js b/src/components/UnpublishedListing/UnpublishedListing.js index b151b3f61490..865af614700c 100644 --- a/src/components/UnpublishedListing/UnpublishedListing.js +++ b/src/components/UnpublishedListing/UnpublishedListing.js @@ -81,7 +81,7 @@ class UnpublishedListing extends React.Component {