Merge pull request #1437 from tiagojsag/short_object_placeholder

add placeholder for empty short description fields

Admin/BaseFieldDescription.php

@@ -197,6 +197,11 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface
             unset($options['help']);
         }
 
+        // set default placeholder
+        if (!isset($options['placeholder'])) {
+            $options['placeholder'] = 'short_object_description_placeholder';
+        }
+
         $this->options = $options;
     }
 

Resources/translations/SonataAdminBundle.bg.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.ca.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.cs.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.de.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.en.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>ACL</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>No selection</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.es.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>Ninguna selección</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.eu.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>ACL</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.fa.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.fr.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>Permissions</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>Aucune sélection</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.hr.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.hu.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.it.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.ja.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.lb.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.nl.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.pl.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>ACL</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.pt.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>Nenhuma selecção</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.pt_BR.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>Nenhuma seleção</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.ro.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.ru.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.sk.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.sl.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.uk.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Resources/translations/SonataAdminBundle.zh_CN.xliff

@@ -366,6 +366,10 @@
                 <source>link_action_acl</source>
                 <target>link_action_acl</target>
             </trans-unit>
+            <trans-unit id="short_object_description_placeholder">
+              <source>short_object_description_placeholder</source>
+              <target>short_object_description_placeholder</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Tests/Admin/BaseFieldDescriptionTest.php

@@ -54,13 +54,17 @@ class BaseFieldDescriptionTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo.twig.html', $description->getTemplate());
         $this->assertEquals('fooHelp', $description->getHelp());
 
-        $this->assertCount(0, $description->getOptions());
+        $this->assertCount(1, $description->getOptions());
 
         $description->setHelp('Please enter an integer');
         $this->assertEquals('Please enter an integer', $description->getHelp());
 
         $description->setMappingType('int');
         $this->assertEquals('int', $description->getMappingType());
+        
+        $this->assertEquals('short_object_description_placeholder', $description->getOption('placeholder'));
+        $description->setOptions(array('placeholder' => false));
+        $this->assertFalse($description->getOption('placeholder'));
     }
 
     public function testAdmin()