Only use label_singular when one item is rendered in the listControl (d…

…ecaporg#1422)
erquhart · Jun 12, 2018 · 00de762 · 00de762
1 parent ed82020
commit 00de762
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/EditorWidgets/List/ListControl.js b/src/components/EditorWidgets/List/ListControl.js
@@ -262,14 +262,15 @@ 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');
+    const label = field.get('label');
+    const labelSingular = field.get('label_singular') || field.get('label');
 
     return (
       <div id={forID} className={c(classNameWrapper, 'nc-listControl')}>
         <TopBar
           allowAdd={field.get('allow_add', true)}
           onAdd={this.handleAdd}
-          listLabel={label.toLowerCase()}
+          listLabel={items.size === 1 ? labelSingular.toLowerCase() : label.toLowerCase()}
           onCollapseAllToggle={this.handleCollapseAllToggle}
           allItemsCollapsed={itemsCollapsed.every(val => val === true)}
           itemsCount={items.size}