Fix gender administration

anilGupta · May 7, 2013 · f675f70 · f675f70
1 parent e045c75
commit f675f70
Show file tree

Hide file tree

Showing 19 changed files with 209 additions and 4 deletions.
diff --git a/Admin/Model/UserAdmin.php b/Admin/Model/UserAdmin.php
@@ -16,6 +16,7 @@
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
+use Sonata\UserBundle\Model\UserInterface;
 
 use FOS\UserBundle\Model\UserManagerInterface;
 
@@ -119,7 +120,15 @@ protected function configureFormFields(FormMapper $formMapper)
                 ->add('lastname', null, array('required' => false))
                 ->add('website', 'url', array('required' => false))
                 ->add('biography', 'text', array('required' => false))
-                ->add('gender', 'textarea', array('required' => false))
+                ->add('gender', 'choice', array(
+                    'choices' => array(
+                        UserInterface::GENDER_UNKNOWN => 'gender_unknown',
+                        UserInterface::GENDER_FEMALE  => 'gender_female',
+                        UserInterface::GENDER_MAN     => 'gender_male',
+                    ),
+                    'required' => true,
+                    'translation_domain' => $this->getTranslationDomain()
+                ))
                 ->add('locale', 'locale', array('required' => false))
                 ->add('timezone', 'timezone', array('required' => false))
                 ->add('phone', null, array('required' => false))

diff --git a/Model/User.php b/Model/User.php
@@ -62,7 +62,7 @@ abstract class User extends AbstractedUser implements UserInterface
     /**
      * @var string
      */
-    protected $gender;
+    protected $gender = UserInterface::GENDER_UNKNOWN; // set the default to unknown
 
     /**
      * @var string

diff --git a/Model/UserInterface.php b/Model/UserInterface.php
@@ -13,6 +13,10 @@
 
 interface UserInterface extends \FOS\UserBundle\Model\UserInterface
 {
+    const GENDER_FEMALE  = 'f';
+    const GENDER_MAN     = 'm';
+    const GENDER_UNKNOWN = 'u';
+
     /**
      * @return string
      */

diff --git a/Resources/translations/SonataUserBundle.bg.xliff b/Resources/translations/SonataUserBundle.bg.xliff
@@ -166,6 +166,18 @@
                 <source>label_two_step_code_error</source>
                 <target>Верификационния код е невалиден</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.ca.xliff b/Resources/translations/SonataUserBundle.ca.xliff
@@ -358,7 +358,18 @@
                 <source>show.label_two_step_verification_code</source>
                 <target>Codi de verificación de dos pasos</target>
             </trans-unit>
-
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.cs.xliff b/Resources/translations/SonataUserBundle.cs.xliff
@@ -314,6 +314,18 @@
                 <source>form.label_date_of_birth</source>
                 <target>Date of birth</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.de.xliff b/Resources/translations/SonataUserBundle.de.xliff
@@ -334,6 +334,18 @@
                 <source>field.label_roles_editable</source>
                 <target>Rollen</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.en.xliff b/Resources/translations/SonataUserBundle.en.xliff
@@ -390,6 +390,18 @@
                 <source>breadcrumb.link_user_show</source>
                 <target>Show</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.es.xliff b/Resources/translations/SonataUserBundle.es.xliff
@@ -362,6 +362,18 @@
                 <source>breadcrumb.link_user_show</source>
                 <target>Mostrar</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.fa.xliff b/Resources/translations/SonataUserBundle.fa.xliff
@@ -362,6 +362,18 @@
                 <source>breadcrumb.link_user_show</source>
                 <target>نمایش</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

diff --git a/Resources/translations/SonataUserBundle.fr.xliff b/Resources/translations/SonataUserBundle.fr.xliff
@@ -117,7 +117,7 @@
             <trans-unit id="filter.label_name">
                 <source>filter.label_name</source>
                 <target>Nom</target>
-            </trans-unit>            
+            </trans-unit>
             <trans-unit id="filter.label_email">
                 <source>filter.label_email</source>
                 <target>Email</target>
@@ -402,6 +402,18 @@
                 <source>breadcrumb.link_user_show</source>
                 <target>Voir</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>non défini</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>femme</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>homme</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.it.xliff b/Resources/translations/SonataUserBundle.it.xliff
@@ -314,6 +314,18 @@
                 <source>form.label_date_of_birth</source>
                 <target>Date of birth</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.nl.xliff b/Resources/translations/SonataUserBundle.nl.xliff
@@ -414,6 +414,18 @@
                 <source>name</source>
                 <target>Naam</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.pl.xliff b/Resources/translations/SonataUserBundle.pl.xliff
@@ -358,6 +358,18 @@
                 <source>form.label_date_of_birth</source>
                 <target>Data urodzin</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.pt.xliff b/Resources/translations/SonataUserBundle.pt.xliff
@@ -314,6 +314,30 @@
                 <source>form.label_date_of_birth</source>
                 <target>Date of birth</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.ru.xliff b/Resources/translations/SonataUserBundle.ru.xliff
@@ -1,3 +1,4 @@
+
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
     <file source-language="en" datatype="plaintext" original="" >

diff --git a/Resources/translations/SonataUserBundle.sk.xliff b/Resources/translations/SonataUserBundle.sk.xliff
@@ -314,6 +314,18 @@
                 <source>form.label_date_of_birth</source>
                 <target>Date of birth</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.sl.xliff b/Resources/translations/SonataUserBundle.sl.xliff
@@ -366,6 +366,18 @@
                 <source>breadcrumb.link_user_show</source>
                 <target>Uporabnik</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/SonataUserBundle.zh_TW.xliff b/Resources/translations/SonataUserBundle.zh_TW.xliff
@@ -206,6 +206,18 @@
                 <source>form.label_date_of_birth</source>
                 <target>Date of birth</target>
             </trans-unit>
+            <trans-unit id="gender_unknown">
+                <source>gender_unknown</source>
+                <target>gender_unknown</target>
+            </trans-unit>
+            <trans-unit id="gender_female">
+                <source>gender_female</source>
+                <target>gender_female</target>
+            </trans-unit>
+            <trans-unit id="gender_male">
+                <source>gender_male</source>
+                <target>gender_male</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>