Merge pull request #130 from FriendsOfCake/fix-double-pluralization

Fix double pluralization.
FriendsOfCake · Jun 5, 2016 · 6b261cd · 6b261cd
2 parents 0794fa1 + 191d5df
commit 6b261cd
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/Listener/ViewListener.php b/src/Listener/ViewListener.php
@@ -333,10 +333,6 @@ protected function _controllerName()
             'humanize',
         ];
 
-        if ($this->_action()->scope() === 'table') {
-            $inflections[] = 'pluralize';
-        }
-
         if ($this->_action()->scope() === 'entity') {
             $inflections[] = 'singularize';
         }
@@ -484,7 +480,7 @@ protected function _associations(array $whitelist = [])
             $associationConfiguration[$type][$assocKey]['foreignKey'] = $association->foreignKey();
             $associationConfiguration[$type][$assocKey]['propertyName'] = $association->property();
             $associationConfiguration[$type][$assocKey]['plugin'] = null;
-            $associationConfiguration[$type][$assocKey]['controller'] = Inflector::pluralize($assocKey);
+            $associationConfiguration[$type][$assocKey]['controller'] = $assocKey;
             $associationConfiguration[$type][$assocKey]['entity'] = Inflector::singularize(Inflector::underscore($assocKey));
             $associationConfiguration[$type][$assocKey]['entities'] = Inflector::underscore($assocKey);