Add label_singular to collection config (#1086)

src/components/App/Header.js

@@ -73,7 +73,7 @@ export default class Header extends React.Component {
                   collections.filter(collection => collection.get('create')).toList().map(collection =>
                     <DropdownItem
                       key={collection.get("name")}
-                      label={collection.get("label")}
+                      label={collection.get("label_singular") || collection.get("label")}
                       onClick={() => this.handleCreatePostClick(collection.get('name'))}
                     />
                   )

src/components/Collection/Collection.js

@@ -46,6 +46,7 @@ class Collection extends React.Component {
               ? null
               : <CollectionTop
                   collectionLabel={collection.get('label')}
+                  collectionLabelSingular={collection.get('label_singular')}
                   collectionDescription={collection.get('description')}
                   newEntryUrl={newEntryUrl}
                   viewStyle={this.state.viewStyle}

src/components/Collection/CollectionTop.js

@@ -7,6 +7,7 @@ import { VIEW_STYLE_LIST, VIEW_STYLE_GRID } from 'Constants/collectionViews';
 
 const CollectionTop = ({
   collectionLabel,
+  collectionLabelSingular,
   collectionDescription,
   viewStyle,
   onChangeViewStyle,
@@ -19,7 +20,7 @@ const CollectionTop = ({
         {
           newEntryUrl
             ? <Link className="nc-collectionPage-topNewButton" to={newEntryUrl}>
-                {`New ${collectionLabel}`}
+                {`New ${collectionLabelSingular || collectionLabel}`}
               </Link>
             : null
         }

src/components/EditorWidgets/List/ListControl.js

@@ -254,12 +254,13 @@ export default class ListControl extends Component {
     const { value, forID, field, classNameWrapper } = this.props;
     const { itemsCollapsed } = this.state;
     const items = value || List();
+    const label = field.get('label_singular') || field.get('label');
 
     return (
       <div id={forID} className={c(classNameWrapper, 'nc-listControl')}>
         <TopBar
           onAdd={this.handleAdd}
-          listLabel={field.get('label').toLowerCase()}
+          listLabel={label.toLowerCase()}
           onCollapseAllToggle={this.handleCollapseAllToggle}
           allItemsCollapsed={itemsCollapsed.every(val => val === true)}
           itemsCount={items.size}